(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.2.6.3 and 1.23

version 1.2.6.3, 2003/08/13 19:39:49 version 1.23, 2004/09/01 00:03:56
Line 12 
Line 12 
  
 PLATFORM_VERSION_SUPPORTED = yes PLATFORM_VERSION_SUPPORTED = yes
  
   ifndef CXX
 CXX = g++ CXX = g++
   endif
  
 SH = sh SH = sh
  
Line 22 
Line 24 
  
 MOVE = mv MOVE = mv
  
   MKDIRHIER = mkdir -p
   
 PEGASUS_SUPPORTS_DYNLIB = yes PEGASUS_SUPPORTS_DYNLIB = yes
  
 MAJOR_VERSION_NUMBER = 1 MAJOR_VERSION_NUMBER = 1
  
 LIB_SUFFIX = .so.$(MAJOR_VERSION_NUMBER) LIB_SUFFIX = .so.$(MAJOR_VERSION_NUMBER)
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  DEFINES += -DPEGASUS_USE_SYSLOGS
  
 SYS_LIBS = -ldl -lpthread -lcrypt  DEFINES += -DPEGASUS_HAS_SIGNALS
  
 ifdef PEGASUS_HAS_SSL  SYS_LIBS = -ldl -lpthread
   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 59 
Line 58 
  
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE
  
 ##  
 ## The following flag sets the Authentication to be PAM based authentication.  
 ##  
   ifdef PEGASUS_ALWAYS_USE_PAM  
    DEFINES += -DPEGASUS_ALWAYS_USE_PAM  
   endif  
 endif endif
  
  
 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 else
 FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 endif endif
  
 ifdef PEGASUS_NO_SLP  
   FLAGS += -DPEGASUS_NO_SLP  
   NO_SLP = true  
 endif  
   
 ifdef PEGASUS_HAS_PERFINST  
   FLAGS += -DPEGASUS_HAS_PERFINST  
 endif  
   
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
Line 103 
Line 87 
         MSG_FLAGS =         MSG_FLAGS =
         MSG_SOURCE_EXT = .txt         MSG_SOURCE_EXT = .txt
         MSG_COMPILE_EXT = .res         MSG_COMPILE_EXT = .res
           CNV_ROOT_CMD = cnv2rootbundle
   
   ##################################
   ##
   ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,
   ## default is to uppercase the root resource bundle##
   ##################################
   
   ifdef ICU_NO_UPPERCASE_ROOT
     CNV_ROOT_FLAGS =
   else
     CNV_ROOT_FLAGS = -u
   endif
   
   ####################################
   ##
   ##   ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from
   ##   defaults to _en if not set.  if set, for any directory containing resource bundles,
   ##   there must exist a file name: package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages target will fail
   ##
   ####################################
   
   ifdef ICU_ROOT_BUNDLE_LANG
     MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)
   else
     MSG_ROOT_SOURCE = _en
   endif
   
     EXTRA_INCLUDES += -I${ICUROOT}/source/common     EXTRA_INCLUDES += -I${ICUROOT}/source/common
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
     SYS_LIBS += -licuuc     SYS_LIBS += -licuuc
     SYS_LIBS += -licui18n     SYS_LIBS += -licui18n
   endif   endif
 endif endif
   
   ####################################
   ##
   ##   If PEGASUS_LSB is set, set the rest of the variables.
   ##
   ####################################
   
   ifdef PEGASUS_LSB
       SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/
       FLAGS += -DPEGASUS_OS_LSB
   endif
   


Legend:
Removed from v.1.2.6.3  
changed lines
  Added in v.1.23

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2