(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.142 and 1.167

version 1.142, 2006/01/24 19:44:18 version 1.167, 2008/04/11 19:05:11
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 25 
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
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 # SSL support  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE      ifdef OPENSSL_HOME
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include   SYS_INCLUDES += -I$(OPENSSL_HOME)/include
 endif endif
   endif
  
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY
  
   ifeq ($(OS_TYPE),vms)
       STATIC=1
   endif
   
 LIBRARY = pegcommon LIBRARY = pegcommon
  
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
       LIBRARIES = ILEWrapperUtils
   endif
   
 ## ##
 ## CAUTION: the source files are divided evenly (more or less) between SOURCES1 ## CAUTION: the source files are divided evenly (more or less) between SOURCES1
 ## and SOURCES2. This avoids a command line buffer overflow on Windows 2000 ## and SOURCES2. This avoids a command line buffer overflow on Windows 2000
Line 50 
Line 60 
 ## ##
  
 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 105 
Line 125 
     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 118 
Line 142 
     HTTPConnection.cpp \     HTTPConnection.cpp \
     HTTPConnector.cpp  \     HTTPConnector.cpp  \
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \  
     IndicationFormatter.cpp \     IndicationFormatter.cpp \
     IPC.cpp \  
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
     Message.cpp \     Message.cpp \
Line 136 
Line 158 
     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 148 
Line 169 
     StatisticalData.cpp \     StatisticalData.cpp \
     Stopwatch.cpp \     Stopwatch.cpp \
     String.cpp \     String.cpp \
       StringConversion.cpp \
     StringInline.cpp \     StringInline.cpp \
     System.cpp \     System.cpp \
     TimeValue.cpp \     TimeValue.cpp \
Line 156 
Line 178 
     TLS.cpp \     TLS.cpp \
     TraceFileHandler.cpp \     TraceFileHandler.cpp \
     Tracer.cpp \     Tracer.cpp \
     Triad.cpp \  
     Thread.cpp \     Thread.cpp \
       ThreadPool.cpp \
     Union.cpp \     Union.cpp \
       XmlGenerator.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 \
       HostLocator.cpp
   
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
       SOURCES2 += PaseCcsid.cpp
   endif
  
 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 180 
Line 210 
  
 SOURCES = $(SOURCES1) $(SOURCES2) SOURCES = $(SOURCES1) $(SOURCES2)
  
 ifeq ($(OS),linux)  
   EXTRA_LIBRARIES += -lcrypt  
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto      ifeq ($(OS_TYPE),windows)
     EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib          SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
       else
           ifdef OPENSSL_HOME
               EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib
           endif
           EXTRA_LIBRARIES += -lssl -lcrypto
   endif   endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
   ifdef PEGASUS_HAS_SSL      ifdef PEGASUS_ZOS_SECURITY
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto          SOURCES += $(SOURCES_SECURITY_ZOS)
   endif   endif
       SOURCES2 += Audit_zOS_SMF.cpp \
           PegasusAssertZOS.cpp
 endif endif
  
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
 AIX_LIB_PRIORITY=-20 AIX_LIB_PRIORITY=-20
   ifdef PEGASUS_HAS_SSL  
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto  
   endif  
 endif endif
  
 ifeq ($(OS),HPUX)  ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
   ifdef PEGASUS_HAS_SSL      AIX_LIB_PRIORITY=-20
     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  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
   ifdef PEGASUS_HAS_SSL  
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto  
   endif  
 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  
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib  
   endif  
   ifdef PEGASUS_WINDOWS_SDK_HOME   ifdef PEGASUS_WINDOWS_SDK_HOME
     FLAGS += -DPEGASUS_WINDOWS_SDK_HOME     FLAGS += -DPEGASUS_WINDOWS_SDK_HOME
     SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib     SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib
Line 236 
Line 250 
   endif   endif
 endif endif
  
 include $(ROOT)/mak/library.mak  include $(ROOT)/mak/dynamic-library.mak
 # DO NOT DELETE # DO NOT DELETE

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