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

Diff for /pegasus/mak/config.mak between version 1.166 and 1.168

version 1.166, 2008/05/22 17:43:53 version 1.168, 2008/06/03 19:10:04
Line 398 
Line 398 
     else     else
         MSG_ROOT_SOURCE = _en         MSG_ROOT_SOURCE = _en
     endif     endif
   
       ifdef ICU_INSTALL
           MSG_COMPILE = $(ICU_INSTALL)/bin/genrb
       else
           MSG_COMPILE = genrb
       endif
   
       MSG_FLAGS =
       MSG_SOURCE_EXT = .txt
       MSG_COMPILE_EXT = .res
   
       ifeq ($(OS),linux)
           CNV_ROOT_CMD = $(BIN_DIR)/cnv2rootbundle
       else
           CNV_ROOT_CMD = cnv2rootbundle
       endif
   
       ifdef ICU_INSTALL
           SYS_INCLUDES += -I$(ICU_INSTALL)/include
       endif
   
       ifeq ($(OS),windows)
           EXTRA_LIBRARIES += \
               $(ICU_INSTALL)/lib/icuuc.lib \
               $(ICU_INSTALL)/lib/icuin.lib \
               $(ICU_INSTALL)/lib/icudt.lib
       else
           ifeq ($(OS),zos)
               # On z/OS, the -L option must appear before the -o option and
               # the object (.o) and sidedeck (.x) files in the link command.
               FLAGS += -L$(ICU_INSTALL)/lib
               PR_FLAGS += -L$(ICU_INSTALL)/lib
               EXTRA_LIBRARIES += \
                   $(ICU_INSTALL)/lib/libicui18n.x \
                   $(ICU_INSTALL)/lib/libicuuc.x
           else
               ifdef ICU_INSTALL
                   EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib
               endif
               EXTRA_LIBRARIES += -licuuc -licui18n
               ifeq ($(OS),linux)
                   EXTRA_LIBRARIES += -licudata
               endif
           endif
       endif
 endif endif
  
 ################################################################################ ################################################################################
Line 470 
Line 515 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
   # PEP 315
   # Control whether compile with or without method entertexit trace code.
   # A value other than 'true' or 'false' will cause a make error.
   ifdef PEGASUS_REMOVE_METHODTRACE
     ifeq ($(PEGASUS_REMOVE_METHODTRACE),true)
       DEFINES += -DPEGASUS_REMOVE_METHODTRACE
     else
       ifneq ($(PEGASUS_REMOVE_METHODTRACE),false)
         $(error PEGASUS_REMOVE_METHODTRACE ($(PEGASUS_REMOVE_METHODTRACE)) invalid, must be true or false)
       endif
     endif
   endif
   
 # PEP 161 # PEP 161
 # Control whether utf-8 filenames are supported by the repository # Control whether utf-8 filenames are supported by the repository
 ifdef PEGASUS_SUPPORT_UTF8_FILENAME ifdef PEGASUS_SUPPORT_UTF8_FILENAME


Legend:
Removed from v.1.166  
changed lines
  Added in v.1.168

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2