(file) Return to config-linux.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config-linux.mak between version 1.16 and 1.29

version 1.16, 2004/06/30 16:03:23 version 1.29, 2005/02/11 23:52:59
Line 6 
Line 6 
 DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU
 DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM)
  
   # Enable CMPI by default.
   #
   PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=yes
   
 OS = linux OS = linux
  
 COMPILER = gnu COMPILER = gnu
  
 PLATFORM_VERSION_SUPPORTED = yes PLATFORM_VERSION_SUPPORTED = yes
  
   ifndef CXX
 CXX = g++ CXX = g++
   endif
  
 SH = sh SH = sh
  
Line 34 
Line 40 
  
 DEFINES += -DPEGASUS_HAS_SIGNALS DEFINES += -DPEGASUS_HAS_SIGNALS
  
 SYS_LIBS = -ldl -lpthread -lcrypt  SYS_LIBS = -ldl -lpthread
   
 ifdef PEGASUS_HAS_SSL  
   SYS_LIBS += -lssl  
 endif  
  
 # Build using fixed release settings # Build using fixed release settings
 # #
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 endif  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
 FLAGS += -DPEGASUS_USE_RELEASE_DIRS    PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib
 endif endif
  
 # PAM support # PAM support
Line 67 
Line 66 
  
  
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -DPEGASUS_DEBUG  FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
   else
   FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs
     ifdef PEGASUS_OPTIMIZE_FOR_SIZE
       FLAGS += -Os
 else else
 FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT      FLAGS += -O2
 endif endif
   
 ifdef PEGASUS_HAS_PERFINST  
   FLAGS += -DPEGASUS_HAS_PERFINST  
 endif endif
  
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
Line 101 
Line 101 
 ################################## ##################################
 ## ##
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle, ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,
 ## default is to uppercase the root resource bundle  ## default is to uppercase the root resource bundle##
 ##  
 ################################## ##################################
  
 ifdef ICU_NO_UPPERCASE_ROOT ifdef ICU_NO_UPPERCASE_ROOT
Line 125 
Line 124 
   MSG_ROOT_SOURCE = _en   MSG_ROOT_SOURCE = _en
 endif endif
  
     EXTRA_INCLUDES += -I${ICUROOT}/source/common      SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
     SYS_LIBS += -licuuc     SYS_LIBS += -licuuc
     SYS_LIBS += -licui18n     SYS_LIBS += -licui18n
Line 139 
Line 138 
 #################################### ####################################
  
 ifdef PEGASUS_LSB ifdef PEGASUS_LSB
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++      SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/
     FLAGS += -DPEGASUS_OS_LSB     FLAGS += -DPEGASUS_OS_LSB
 endif endif
  

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