(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.76 and 1.93

version 1.76, 2002/05/30 15:55:19 version 1.93, 2003/08/12 17:47:44
Line 4 
Line 4 
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
   # SSL support
   ifdef PEGASUS_HAS_SSL
     FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
     SYS_INCLUDES += -I$(OPENSSL_HOME)/include
   endif
   
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY -DPEGASUS_MEMORY_DEBUG LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY -DPEGASUS_MEMORY_DEBUG
  
 LIBRARY = pegcommon LIBRARY = pegcommon
Line 13 
Line 19 
     AsyncOpNode.cpp \     AsyncOpNode.cpp \
     AuthenticationInfoRep.cpp \     AuthenticationInfoRep.cpp \
     Base64.cpp \     Base64.cpp \
       LanguageParser.cpp \
       LanguageElement.cpp \
       AcceptLanguageElement.cpp \
       ContentLanguageElement.cpp \
       LanguageElementContainer.cpp \
       AcceptLanguages.cpp \
       ContentLanguages.cpp \
       MessageLoader.cpp \
     CGIQueryString.cpp \     CGIQueryString.cpp \
     Char16.cpp \     Char16.cpp \
     CIMClass.cpp \     CIMClass.cpp \
Line 54 
Line 68 
     Dir.cpp \     Dir.cpp \
     DQueue.cpp \     DQueue.cpp \
     Exception.cpp \     Exception.cpp \
       InternalException.cpp \
     FileSystem.cpp \     FileSystem.cpp \
     Formatter.cpp \     Formatter.cpp \
     HashTable.cpp \     HashTable.cpp \
Line 71 
Line 86 
     ModuleController.cpp \     ModuleController.cpp \
     Monitor.cpp \     Monitor.cpp \
     OperationContext.cpp \     OperationContext.cpp \
       OperationContextInternal.cpp \
     OptionManager.cpp \     OptionManager.cpp \
     Pair.cpp \     Pair.cpp \
     Queue.cpp \     Queue.cpp \
       Resolver.cpp \
       ResponseHandler.cpp \
     Service.cpp \     Service.cpp \
     Sharable.cpp \     Sharable.cpp \
       Signal.cpp \
     Socket.cpp \     Socket.cpp \
     Stack.cpp \     Stack.cpp \
     StatisticalData.cpp \     StatisticalData.cpp \
Line 87 
Line 106 
     TLS.cpp \     TLS.cpp \
     TraceFileHandler.cpp \     TraceFileHandler.cpp \
     Tracer.cpp \     Tracer.cpp \
       Triad.cpp \
     Thread.cpp \     Thread.cpp \
     Union.cpp \     Union.cpp \
     XmlParser.cpp \     XmlParser.cpp \
     XmlReader.cpp \     XmlReader.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \     MofWriter.cpp \
     peg_authorization.cpp      peg_authorization.cpp \
       CommonUTF.cpp
 ##  
 ## Took these out again. They broke the NT build.  
 ##  
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)
 SOURCES += Signal.cpp    ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
 SOURCES += Signal.cpp    ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)  ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)
 SOURCES += Signal.cpp    ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
 SOURCES += Signal.cpp  AIX_LIB_PRIORITY=-20
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl
     endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  ifeq ($(OS),HPUX)
 SOURCES += Signal.cpp    ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
 SYS_LIBS = ws2_32.lib advapi32.lib SYS_LIBS = ws2_32.lib advapi32.lib
   endif
  
 include $(ROOT)/mak/library.mak include $(ROOT)/mak/library.mak
   
 # DO NOT DELETE # DO NOT DELETE

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