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

Diff for /pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile between version 1.10 and 1.15

version 1.10, 2007/07/10 18:36:03 version 1.15, 2008/11/18 19:56:40
Line 45 
Line 45 
  
 LOCAL_DEFINES = -DPEGASUS_CERTIFICATEPROVIDER_INTERNAL -DPEGASUS_INTERNALONLY LOCAL_DEFINES = -DPEGASUS_CERTIFICATEPROVIDER_INTERNAL -DPEGASUS_INTERNALONLY
  
   ifeq ($(OS_TYPE),vms)
       STATIC=1
   endif
   
 LIBRARY = CertificateProvider LIBRARY = CertificateProvider
  
 LIBRARIES = \ LIBRARIES = \
         pegcommon \      pegrepository \
       pegprovider \
         pegconfig \         pegconfig \
         pegprovider      pegcommon
   
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
       LIBRARIES += ILEWrapperUtils
   endif
  
 SOURCES = CertificateProvider.cpp SOURCES = CertificateProvider.cpp
  
Line 60 
Line 69 
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   ifeq ($(OS_TYPE),windows)   ifeq ($(OS_TYPE),windows)
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.l          SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
       else
           ifeq ($(OS_TYPE),vms)
               EXTRA_LIBRARIES += -L$(OPENSSL_LIB) \
                   -lssl$$libssl_shr32 -lssl$$libcrypto_shr32
   else   else
     ifdef OPENSSL_HOME     ifdef OPENSSL_HOME
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib
Line 68 
Line 81 
     EXTRA_LIBRARIES += -lssl -lcrypto     EXTRA_LIBRARIES += -lssl -lcrypto
   endif   endif
 endif endif
   endif
  
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
   AIX_LIB_PRIORITY=-20   AIX_LIB_PRIORITY=-20
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
       AIX_LIB_PRIORITY=-20
   endif
   
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib      SYS_LIBS += ws2_32.lib advapi32.lib netapi32.lib
 endif endif
  
 include $(ROOT)/mak/library.mak  include $(ROOT)/mak/dynamic-library.mak

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