(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.147.2.6 and 1.160

version 1.147.2.6, 2006/07/30 22:51:02 version 1.160, 2007/07/12 00:49:36
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
  
 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
  
 LIBRARY = pegcommon LIBRARY = pegcommon
Line 52 
Line 51 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       Executor.cpp \
       CIMError.cpp \
       PropertyAccessor.cpp \
     Once.cpp \     Once.cpp \
     Time.cpp \     Time.cpp \
     Threads.cpp \     Threads.cpp \
Line 117 
Line 119 
     List.cpp \     List.cpp \
     AsyncQueue.cpp \     AsyncQueue.cpp \
     IDFactory.cpp \     IDFactory.cpp \
       AuditLogger.cpp \
     Magic.cpp     Magic.cpp
  
 SOURCES2 = \ SOURCES2 = \
Line 174 
Line 177 
     XmlStreamer.cpp \     XmlStreamer.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \     MofWriter.cpp \
     CommonUTF.cpp      CommonUTF.cpp \
       Constants.cpp \
       HostAddress.cpp \
       HostLocator.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 189 
Line 196 
  
 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)
       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
 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  
   
 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  
   
 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

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