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

Diff for /pegasus/mak/library-unix.mak between version 1.14 and 1.15

version 1.14, 2001/07/17 01:40:40 version 1.15, 2001/12/13 14:53:31
Line 13 
Line 13 
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
     ifdef PEGASUS_CCOVER
       LIBRARIES += $(CCOVER_LIB)/libcov-PIC.a
     endif
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
Line 29 
Line 32 
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
   ifeq ($(COMPILER),ibm)
     LINK_COMMAND = c++ -W l,dll -W c,dll,expo
     LINK_ARGUMENTS =
     LINK_OUT = -o
   endif
   
 FULL_LIB=$(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) FULL_LIB=$(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
  
 ## Rule for all UNIX library builds ## Rule for all UNIX library builds
Line 44 
Line 53 
     ## libraries.mak file that includes this file     ## libraries.mak file that includes this file
     ##     ##
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT)$(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT)$(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES)
   
       ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
         ## z/OS needs side definition files to link executables to
         ## dynamic libraries, so we have to copy them into the lib_dir
           $(COPY) $(ROOT)/src/$(DIR)/*.x $(LIB_DIR)
       endif
   
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)
   endif   endif


Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2