(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.80

version 1.76, 2002/05/30 15:55:19 version 1.80, 2002/08/06 21:28:35
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 74 
Line 80 
     OptionManager.cpp \     OptionManager.cpp \
     Pair.cpp \     Pair.cpp \
     Queue.cpp \     Queue.cpp \
       Resolver.cpp \
     Service.cpp \     Service.cpp \
     Sharable.cpp \     Sharable.cpp \
     Socket.cpp \     Socket.cpp \
Line 87 
Line 94 
     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 \
Line 105 
Line 113 
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
 SOURCES += Signal.cpp 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),AIX_RS_IBMCXX)
 SOURCES += Signal.cpp SOURCES += Signal.cpp
   AIX_LIB_PRIORITY=-20
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
Line 117 
Line 129 
  
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC) ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
 SOURCES += Signal.cpp 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.80
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2