(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.19 and 1.33

version 1.19, 2002/03/11 22:38:47 version 1.33, 2002/09/09 19:14:14
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) -Wl,-bhalt:$(AIX_LD_HALT)
   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 ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)
       LINK_COMMAND += +DD64 -mt
     endif
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
     LINK_COMMAND += -Wl,+b/usr/lib -Wl,+s      LINK_COMMAND += -Wl,+s -Wl,+b/opt/wbem/lib
   endif   endif
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
Line 33 
Line 38 
 endif endif
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = c++ -W l,dll -W c,dll,expo    LINK_COMMAND = c++ $(FLAGS)
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
Line 50 
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
       ## dynamic libraries, so we have to copy them into the lib_dir       ## dynamic libraries, so we have to copy them into the lib_dir
         $(COPY) $(ROOT)/src/$(DIR)/*.x $(LIB_DIR)          touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x
           cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
       endif
       ifeq ($(OS),HPUX)
           $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX)
     endif     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 67 
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.19  
changed lines
  Added in v.1.33

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2