(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.23 and 1.30

version 1.23, 2002/04/10 18:15:33 version 1.30, 2002/09/01 18:18:23
Line 1 
Line 1 
 ifeq ($(COMPILER),xlc) ifeq ($(COMPILER),xlc)
   LINK_COMMAND = makeC++SharedLib_r    LINK_COMMAND = xlC_r
   LINK_ARGUMENTS = -p 0    LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY)
   LINK_OUT = -o   LINK_OUT = -o
     ifeq ($(PEGASUS_SUPPORTS_DYNLIB), yes)
       LINK_COMMAND += -G
     endif
 endif endif
  
 ifeq ($(COMPILER),acc) ifeq ($(COMPILER),acc)
   LINK_COMMAND = aCC -b    LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)
   ifeq ($(HPUX_IA64_VERSION), yes)   ifeq ($(HPUX_IA64_VERSION), yes)
     LINK_COMMAND += +DD64 -mt     LINK_COMMAND += +DD64 -mt
   endif   endif
Line 52 
Line 55 
     ## DYNAMIC_LIBRARIES must be defined appropriately in the     ## DYNAMIC_LIBRARIES must be defined appropriately in the
     ## 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) $(EXTRA_LIBRARIES)
  
     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
       ## z/OS needs side definition files to link executables to       ## z/OS needs side definition files to link executables to
Line 60 
Line 63 
         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x
         cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)         cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
     endif     endif
       ifeq ($(OS),HPUX)
           $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX)
       endif
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)          $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(EXTRA_LIBRARIES)
   endif   endif
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
Line 69 
Line 75 
 clean-lib: $(ERROR) clean-lib: $(ERROR)
         rm -f $(FULL_LIB)         rm -f $(FULL_LIB)
  
   ln:
           ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).sl
   
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)


Legend:
Removed from v.1.23  
changed lines
  Added in v.1.30

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2