(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.5 and 1.8

version 1.5, 2007/02/15 16:39:13 version 1.8, 2007/08/01 02:17:12
Line 144 
Line 144 
   LINK_COMMAND = $(CXX) $(FLAGS)   LINK_COMMAND = $(CXX) $(FLAGS)
   LINK_ARGUMENTS = -W "l,XPLINK,dll,EDIT=NO"   LINK_ARGUMENTS = -W "l,XPLINK,dll,EDIT=NO"
   LINK_OUT = -o   LINK_OUT = -o
     ifdef PEGASUS_GENERATE_LISTINGS
       LINK_ARGUMENTS += -W"l,MAP,LIST"
     endif
 endif endif
  
 ##============================================================================== ##==============================================================================
Line 187 
Line 190 
         rm -f $(FULL_LIB)         rm -f $(FULL_LIB)
     endif     endif
  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)      ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
           rm -f $(FULL_LIB)
       endif
  
     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
           @ $(ZIP) $(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
         cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)          mv $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
       else
   
           $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)
   
     endif     endif
   else   else
         $(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)
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=sl          ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).sl
     endif     endif
     ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)     ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so          ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).so
     endif     endif
     ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU     ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so          ln -f -s $(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(LIB_DIR)/lib$(LIBRARY).so
     endif     endif
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
Line 221 
Line 232 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## ln (target to create soft link)  ## FILES_TO_CLEAN (files removed by "make clean")
 ## ##
 ##============================================================================== ##==============================================================================
  
 ln:  
         ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX)  
   
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)
   ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
       FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).sl
   endif
   ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
       FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so
   endif
   ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
       FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so
   endif


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.8

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2