(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.12 and 1.13

version 1.12, 2001/07/16 22:28:06 version 1.13, 2001/07/17 00:21:58
Line 32 
Line 32 
 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) $(ERROR)  $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(LIBRARIES) \
       $(ERROR)
 ifneq ($(COMPILER),xlc) ifneq ($(COMPILER),xlc)
   ## Actions for all UNIX compilers except xlc   ## Actions for all UNIX compilers except xlc
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
Line 45 
Line 46 
         $(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)
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)
           $(TOUCH) $(FULL_LIB)
   endif   endif
 else else
   ## Actions for xlc compiler only  
         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(LIBRARIES)         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(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
         @ $(ECHO)         @ $(ECHO)
  


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2