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

Diff for /pegasus/mak/program-unix.mak between version 1.43 and 1.44

version 1.43, 2008/02/27 20:19:16 version 1.44, 2008/03/11 19:39:49
Line 38 
Line 38 
  
 LINK_LIB_DIR = -Xlinker $(LIB_DIR) LINK_LIB_DIR = -Xlinker $(LIB_DIR)
  
 LINK_ICU = -Xlinker ${ICU_INSTALL}/lib  
   
 ifndef LINK_RPATH_LINK ifndef LINK_RPATH_LINK
     LINK_RPATH_LINK = -Xlinker -rpath-link     LINK_RPATH_LINK = -Xlinker -rpath-link
 endif endif
Line 75 
Line 73 
 endif endif
 endif endif
  
   ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
       ifdef PEGASUS_USE_RELEASE_DIRS
           EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR)
       else
           EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_LIB_DIR)
       endif
   
       ifdef ICU_INSTALL
           EXTRA_LINK_FLAGS += $(LINK_RPATH) -Xlinker ${ICU_INSTALL}/lib
       endif
   endif
   
 ifdef PEGASUS_PURIFY ifdef PEGASUS_PURIFY
     PUREOPTIONS = -follow-child-processes=yes -locking=no \     PUREOPTIONS = -follow-child-processes=yes -locking=no \
         -always-use-cache-dir -cache-dir=$(PURIFY_TMP)/cache \         -always-use-cache-dir -cache-dir=$(PURIFY_TMP)/cache \
Line 104 
Line 114 
         @ $(ZIP) -a -m $(FULL_PROGRAM).llst.zip $(PROGRAM).llst         @ $(ZIP) -a -m $(FULL_PROGRAM).llst.zip $(PROGRAM).llst
      else      else
       ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU       ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         ifdef PEGASUS_HAS_MESSAGES          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
           ifdef ICU_ROOT  
             ifdef ICU_INSTALL  
               ifdef  PEGASUS_USE_RELEASE_DIRS  
                 $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)  
               else  
                 $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)  
               endif  
             endif  
           endif  
         else  
           ifdef  PEGASUS_USE_RELEASE_DIRS  
             $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)  
           else  
             $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)  
           endif  
         endif  
       else       else
        ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)        ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
          ifdef  PEGASUS_USE_RELEASE_DIRS          ifdef  PEGASUS_USE_RELEASE_DIRS

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