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

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

version 1.168, 2008/06/03 19:10:04 version 1.169, 2008/06/05 17:27:44
Line 415 
Line 415 
         CNV_ROOT_CMD = cnv2rootbundle         CNV_ROOT_CMD = cnv2rootbundle
     endif     endif
  
       # The library path option is needed on all link commands with some ICU
       # builds, because internal ICU library dependencies are resolved
       # dynamically.
       ifdef ICU_INSTALL
           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
           else
               EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib
           endif
       endif
   
       # The ICU include path and library dependencies are restricted to
       # where they are specifically needed.
       ifeq ($(HAS_ICU_DEPENDENCY),true)
     ifdef ICU_INSTALL     ifdef ICU_INSTALL
         SYS_INCLUDES += -I$(ICU_INSTALL)/include         SYS_INCLUDES += -I$(ICU_INSTALL)/include
     endif     endif
Line 426 
Line 443 
             $(ICU_INSTALL)/lib/icudt.lib             $(ICU_INSTALL)/lib/icudt.lib
     else     else
         ifeq ($(OS),zos)         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 += \             EXTRA_LIBRARIES += \
                 $(ICU_INSTALL)/lib/libicui18n.x \                 $(ICU_INSTALL)/lib/libicui18n.x \
                 $(ICU_INSTALL)/lib/libicuuc.x                 $(ICU_INSTALL)/lib/libicuuc.x
         else         else
             ifdef ICU_INSTALL  
                 EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib  
             endif  
             EXTRA_LIBRARIES += -licuuc -licui18n             EXTRA_LIBRARIES += -licuuc -licui18n
             ifeq ($(OS),linux)             ifeq ($(OS),linux)
                 EXTRA_LIBRARIES += -licudata                 EXTRA_LIBRARIES += -licudata
Line 444 
Line 454 
         endif         endif
     endif     endif
 endif endif
   endif
  
 ################################################################################ ################################################################################
 ## ##

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