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

version 1.15, 2001/12/13 14:53:31 version 1.16, 2001/12/25 04:22:41
Line 14 
Line 14 
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
   ifdef PEGASUS_CCOVER   ifdef PEGASUS_CCOVER
     LIBRARIES += $(CCOVER_LIB)/libcov-PIC.a      FULL_LIBRARIES += $(CCOVER_LIB)/libcov-PIC.a
   endif   endif
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
Line 41 
Line 41 
 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 61 
Line 61 
     endif     endif
  
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)          $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)
   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
 endif endif


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2