(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.8 and 1.14

version 1.8, 2007/08/01 02:17:12 version 1.14, 2008/10/22 07:55:35
Line 40 
Line 40 
   LINK_COMMAND = xlC_r   LINK_COMMAND = xlC_r
   ifdef PEGASUS_USE_RELEASE_DIRS   ifdef PEGASUS_USE_RELEASE_DIRS
     ifdef PEGASUS_HAS_MESSAGES     ifdef PEGASUS_HAS_MESSAGES
       ifdef ICU_ROOT  
         ifdef ICU_INSTALL         ifdef ICU_INSTALL
           LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/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
       endif  
     else     else
       LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/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
Line 157 
Line 155 
  
 ifeq ($(COMPILER),CC) ifeq ($(COMPILER),CC)
   LINK_COMMAND = CC   LINK_COMMAND = CC
   LINK_ARGUMENTS = -G -KPIC -mt -h lib$(LIBRARY).so    LINK_ARGUMENTS = -G -KPIC -mt -h lib$(LIBRARY).so $(LINK_MACHINE_OPTIONS)
   LINK_OUT = -o   LINK_OUT = -o
   EXTRA_LIBRARIES += $(LIBRARY_SYS_LIBS)   EXTRA_LIBRARIES += $(LIBRARY_SYS_LIBS)
 endif endif
Line 194 
Line 192 
         rm -f $(FULL_LIB)         rm -f $(FULL_LIB)
     endif     endif
  
     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)      ifeq ($(OS),zos)
         $(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) $(EXTRA_LIBRARIES) $(SYS_LIBS) $(DYNAMIC_LIBRARIES) > 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)$(DYNLIB_SUFFIX)
         mv $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)          mv $(ROOT)/src/$(DIR)/lib$(LIBRARY)$(DYNLIB_SUFFIX) $(LIB_DIR)
     else     else
  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)
Line 210 
Line 208 
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)
   endif   endif
     ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)     ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
         ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).sl          $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
               ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=sl
     endif     endif
     ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)     ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
         ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).so          $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
               ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
     endif     endif
     ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU     ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).so          $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
               ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
     endif     endif
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
Line 232 
Line 233 
  
 ##============================================================================== ##==============================================================================
 ## ##
   ## ln (target to create soft link)
   ##
   ## This target is used to allow the current working directory to be set in a
   ## separate "make" execution, to avoid using fully-specified paths in the link
   ## command.
   ##
   ##==============================================================================
   
   ln:
           ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX)
   
   ##==============================================================================
   ##
 ## FILES_TO_CLEAN (files removed by "make clean") ## FILES_TO_CLEAN (files removed by "make clean")
 ## ##
 ##============================================================================== ##==============================================================================

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