(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.58 and 1.125

version 1.58, 2002/02/08 17:13:27 version 1.125, 2005/05/10 14:50:54
Line 4 
Line 4 
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL  # 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
  
 LIBRARY = pegcommon LIBRARY = pegcommon
  
 SOURCES = \ SOURCES = \
       AnonymousPipe.cpp \
     Array.cpp \     Array.cpp \
     AsyncOpNode.cpp \     AsyncOpNode.cpp \
     AuthenticationInfo.cpp \      AuthenticationInfoRep.cpp \
       AutoStreamer.cpp \
     Base64.cpp \     Base64.cpp \
     CGIQueryString.cpp \      BinaryStreamer.cpp \
       LanguageParser.cpp \
       LanguageElement.cpp \
       LanguageElementRep.cpp \
       AcceptLanguageElement.cpp \
       ContentLanguageElement.cpp \
       LanguageElementContainer.cpp \
       LanguageElementContainerRep.cpp \
       AcceptLanguages.cpp \
       ContentLanguages.cpp \
       MessageLoader.cpp \
     Char16.cpp \     Char16.cpp \
     CIMClass.cpp \     CIMClass.cpp \
     CIMClassRep.cpp \     CIMClassRep.cpp \
     CIMDateTime.cpp \     CIMDateTime.cpp \
     CIMFlavor.cpp \     CIMFlavor.cpp \
     CIMIndication.cpp \  
     CIMInstance.cpp \     CIMInstance.cpp \
     CIMInstanceRep.cpp \     CIMInstanceRep.cpp \
     CIMNamedInstance.cpp \  
     CIMMessage.cpp \     CIMMessage.cpp \
       CIMMessageSerializer.cpp \
       CIMMessageDeserializer.cpp \
     CIMMethod.cpp \     CIMMethod.cpp \
     CIMMethodRep.cpp \     CIMMethodRep.cpp \
     CIMName.cpp \     CIMName.cpp \
     CIMObject.cpp \     CIMObject.cpp \
     CIMObjectRep.cpp \     CIMObjectRep.cpp \
       CIMObjectPath.cpp \
     Cimom.cpp \     Cimom.cpp \
     CimomMessage.cpp \     CimomMessage.cpp \
     CIMParameter.cpp \     CIMParameter.cpp \
Line 44 
Line 63 
     CIMQualifierList.cpp \     CIMQualifierList.cpp \
     CIMQualifierNames.cpp \     CIMQualifierNames.cpp \
     CIMQualifierRep.cpp \     CIMQualifierRep.cpp \
     CIMReference.cpp \  
     CIMScope.cpp \     CIMScope.cpp \
     CIMStatusCode.cpp \     CIMStatusCode.cpp \
     CIMType.cpp \     CIMType.cpp \
     CIMValue.cpp \     CIMValue.cpp \
     Config.cpp \     Config.cpp \
     DeclContext.cpp \     DeclContext.cpp \
     Destroyer.cpp \  
     Dir.cpp \     Dir.cpp \
     DQueue.cpp \     DQueue.cpp \
       DynamicLibrary.cpp \
     Exception.cpp \     Exception.cpp \
       InternalException.cpp \
     FileSystem.cpp \     FileSystem.cpp \
     Formatter.cpp \     Formatter.cpp \
     HashTable.cpp \     HashTable.cpp \
Line 63 
Line 82 
     HTTPConnector.cpp  \     HTTPConnector.cpp  \
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \     Indentor.cpp \
       IndicationFormatter.cpp \
     IPC.cpp \     IPC.cpp \
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
     Message.cpp \     Message.cpp \
     MessageQueue.cpp \     MessageQueue.cpp \
     MessageQueueService.cpp \     MessageQueueService.cpp \
       ModuleController.cpp \
     Monitor.cpp \     Monitor.cpp \
       ObjectNormalizer.cpp \
     OperationContext.cpp \     OperationContext.cpp \
       OperationContextInternal.cpp \
     OptionManager.cpp \     OptionManager.cpp \
     Pair.cpp \     Pair.cpp \
       QueryExpressionRep.cpp \
     Queue.cpp \     Queue.cpp \
     Service.cpp \      Resolver.cpp \
       ResponseHandler.cpp \
       ResponseHandlerRep.cpp \
     Sharable.cpp \     Sharable.cpp \
       Signal.cpp \
     Socket.cpp \     Socket.cpp \
     Stack.cpp \     Stack.cpp \
       StatisticalData.cpp \
     Stopwatch.cpp \     Stopwatch.cpp \
     String.cpp \     String.cpp \
     System.cpp \     System.cpp \
     TimeValue.cpp \     TimeValue.cpp \
       SSLContext.cpp \
       SSLContextManager.cpp \
     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      XmlStreamer.cpp \
       XmlWriter.cpp \
       MofWriter.cpp \
       peg_authorization.cpp \
       CommonUTF.cpp
   
   SOURCES_SLP = Attribute.cpp \
       CIMServerDescription.cpp
  
 ##  ifdef PEGASUS_ENABLE_SLP
 ## Took these out again. They broke the NT build.    SOURCES += $(SOURCES_SLP)
 ##  endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifeq ($(OS),linux)
 SOURCES += Signal.cpp    EXTRA_LIBRARIES += -lcrypt
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
       EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
     endif
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
 SOURCES += Signal.cpp  AIX_LIB_PRIORITY=-20
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   ifeq ($(OS),HPUX)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
 endif endif
  
 SYS_LIBS = ws2_32.lib advapi32.lib  ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6.
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
     SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib
     ifdef PEGASUS_HAS_SSL
       SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
     endif
     ifdef PEGASUS_WINDOWS_SDK_HOME
       FLAGS += -DPEGASUS_WINDOWS_SDK_HOME
       SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib
     else
       SYS_LIBS += secur32.lib
     endif
   endif
  
 include $(ROOT)/mak/library.mak include $(ROOT)/mak/library.mak
   # DO NOT DELETE

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