(file) Return to Makefile CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Makefile between version 1.143 and 1.155.4.1

version 1.143, 2006/01/30 16:17:05 version 1.155.4.1, 2007/06/08 10:40:29
Line 27 
Line 27 
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #// #//
 #//==============================================================================  #//=============================================================================
 ROOT = ../../.. ROOT = ../../..
  
 DIR = Pegasus/Common DIR = Pegasus/Common
Line 52 
Line 52 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       Executor.cpp \
       CIMError.cpp \
       PropertyAccessor.cpp \
       Once.cpp \
       Time.cpp \
       Threads.cpp \
       TSDKey.cpp \
       Semaphore.cpp \
       ReadWriteSem.cpp \
       Condition.cpp \
     AnonymousPipe.cpp \     AnonymousPipe.cpp \
     Array.cpp \     Array.cpp \
     AsyncOpNode.cpp \     AsyncOpNode.cpp \
Line 107 
Line 117 
     Config.cpp \     Config.cpp \
     DeclContext.cpp \     DeclContext.cpp \
     Dir.cpp \     Dir.cpp \
     DQueue.cpp      List.cpp \
       AsyncQueue.cpp \
       IDFactory.cpp \
       AuditLogger.cpp \
       Magic.cpp
  
 SOURCES2 = \ SOURCES2 = \
     DynamicLibrary.cpp \     DynamicLibrary.cpp \
Line 122 
Line 136 
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \     Indentor.cpp \
     IndicationFormatter.cpp \     IndicationFormatter.cpp \
     IPC.cpp \  
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
     Message.cpp \     Message.cpp \
Line 138 
Line 151 
     Packer.cpp \     Packer.cpp \
     Pair.cpp \     Pair.cpp \
     QueryExpressionRep.cpp \     QueryExpressionRep.cpp \
     Queue.cpp \  
     Resolver.cpp \     Resolver.cpp \
     ResponseHandler.cpp \     ResponseHandler.cpp \
     ResponseHandlerRep.cpp \     ResponseHandlerRep.cpp \
Line 158 
Line 170 
     TLS.cpp \     TLS.cpp \
     TraceFileHandler.cpp \     TraceFileHandler.cpp \
     Tracer.cpp \     Tracer.cpp \
     Triad.cpp \  
     Thread.cpp \     Thread.cpp \
       ThreadPool.cpp \
     Union.cpp \     Union.cpp \
     XmlParser.cpp \     XmlParser.cpp \
     XmlReader.cpp \     XmlReader.cpp \
     XmlStreamer.cpp \     XmlStreamer.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \     MofWriter.cpp \
     peg_authorization.cpp \      CommonUTF.cpp \
     CommonUTF.cpp      Constants.cpp \
       HostAddress.cpp
  
 SOURCES_SLP = Attribute.cpp \ SOURCES_SLP = Attribute.cpp \
     CIMServerDescription.cpp     CIMServerDescription.cpp
  
   SOURCES_SECURITY_ZOS = MustStayCleanzOS.c
 ifeq ($(PEGASUS_ENABLE_SLP),true) ifeq ($(PEGASUS_ENABLE_SLP),true)
   SOURCES2 += $(SOURCES_SLP)   SOURCES2 += $(SOURCES_SLP)
 endif endif
Line 186 
Line 200 
   EXTRA_LIBRARIES += -lcrypt   EXTRA_LIBRARIES += -lcrypt
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib  
   endif   endif
 endif endif
  
Line 194 
Line 207 
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
   endif   endif
     ifdef PEGASUS_ZOS_SECURITY
       SOURCES += $(SOURCES_SECURITY_ZOS)
     endif
 endif endif
  
  
Line 223 
Line 239 
 endif endif
  
 # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6. # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6.
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  ifeq ($(OS_TYPE),windows)
   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.155.4.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2