(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.13 and 1.16

version 1.13, 2001/07/17 00:21:58 version 1.16, 2001/12/25 04:22:41
Line 13 
Line 13 
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
     ifdef PEGASUS_CCOVER
       FULL_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
 $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(LIBRARIES) \  $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) \
     $(ERROR)     $(ERROR)
 ifneq ($(COMPILER),xlc) ifneq ($(COMPILER),xlc)
   ## Actions for all UNIX compilers except xlc   ## Actions for all UNIX compilers except xlc
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) $(FULL_LIBRARIES)
         $(TOUCH) $(FULL_LIB)  
   endif   endif
 else else
         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(LIBRARIES)          ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(FULL_LIBRARIES)
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT)$(FULL_LIB) $(PEGASUS_PLATFORM).lib         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT)$(FULL_LIB) $(PEGASUS_PLATFORM).lib
         rm -f $(PEGASUS_PLATFORM).lib         rm -f $(PEGASUS_PLATFORM).lib
         $(TOUCH) $(FULL_LIB)  
 endif endif
           $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
  
 clean-lib: $(ERROR) clean-lib: $(ERROR)


Legend:
Removed from v.1.13  
changed lines
  Added in v.1.16

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2