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

Diff for /pegasus/mak/shared-library-unix.mak between version 1.10.6.2 and 1.12

version 1.10.6.2, 2008/11/19 09:49:08 version 1.12, 2008/09/11 12:34:52
Line 41 
Line 41 
   ifdef PEGASUS_USE_RELEASE_DIRS   ifdef PEGASUS_USE_RELEASE_DIRS
     ifdef PEGASUS_HAS_MESSAGES     ifdef PEGASUS_HAS_MESSAGES
       ifdef ICU_INSTALL       ifdef ICU_INSTALL
         LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT)          LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT)
       endif       endif
     else     else
       LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)        LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)
     endif     endif
   else   else
     LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)     LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)
Line 194 
Line 194 
  
     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS) > lib$(LIBRARY).llst         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS) > lib$(LIBRARY).llst
         @ $(ZIP) $(FULL_LIB).llst.zip lib$(LIBRARY).llst          @ $(ZIP) -a -m $(FULL_LIB).llst.zip lib$(LIBRARY).llst
       ## z/OS needs side definition files to link executables to       ## z/OS needs side definition files to link executables to
       ## dynamic libraries, so we have to copy them into the lib_dir       ## dynamic libraries, so we have to copy them into the lib_dir
         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x


Legend:
Removed from v.1.10.6.2  
changed lines
  Added in v.1.12

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2