(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.18 and 1.34

version 1.18, 2004/08/02 19:36:32 version 1.34, 2005/04/07 18:38:42
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
Line 18 
Line 22 
  
 SH = sh SH = sh
  
 YACC = yacc  YACC = bison
   
   RM = rm -f
   
   DIFF = diff
   
   SORT = sort
  
 COPY = cp COPY = cp
  
Line 36 
Line 46 
  
 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 69 
Line 72 
  
  
 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 endif
  
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
  
 ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  
  FLAGS += -DPEGASUS_LOCAL_DOMAIN_SOCKET  
 endif  
   
 ifdef USE_CONNECTLOCAL  
  FLAGS += -DUSE_CONNECTLOCAL  
 endif  
   
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
   DEFINES += -DPEGASUS_HAS_MESSAGES   DEFINES += -DPEGASUS_HAS_MESSAGES
Line 122 
Line 122 
   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      EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata
     SYS_LIBS += -licui18n  
   endif   endif
 endif endif
  

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