(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.6 and 1.7

version 1.6, 2007/02/27 19:47:10 version 1.7, 2007/04/23 07:44:33
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),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)


Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2