(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.39.4.1 and 1.60

version 1.39.4.1, 2003/08/13 19:39:49 version 1.60, 2005/03/07 18:10:38
Line 1 
Line 1 
 ifeq ($(COMPILER),xlc) ifeq ($(COMPILER),xlc)
   LINK_COMMAND = xlC_r   LINK_COMMAND = xlC_r
     ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)
     else
   LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)   LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)
     endif
   LINK_OUT = -o   LINK_OUT = -o
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB), yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB), yes)
     LINK_COMMAND += -G     LINK_COMMAND += -G
Line 11 
Line 15 
   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)
   ifeq ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)   ifeq ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)
     LINK_COMMAND += +DD64 -mt     LINK_COMMAND += +DD64 -mt
     else
       LINK_COMMAND += -Wl,-Bsymbolic
   endif   endif
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
     LINK_COMMAND += -Wl,+s -Wl,+b/opt/wbem/lib:/usr/lib      ifdef PEGASUS_USE_RELEASE_DIRS
         LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib
         ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
           LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)
         endif
       else
           LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/lib
       endif
   endif   endif
     LINK_COMMAND += -Wl,+s
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
   ifdef PEGASUS_CCOVER   ifdef PEGASUS_CCOVER
     FULL_LIBRARIES += $(CCOVER_LIB)/libcov.a      EXTRA_LIBRARIES += $(CCOVER_LIB)/libcov.a
   endif   endif
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
 ifeq ($(COMPILER),gnu) ifeq ($(COMPILER),gnu)
   LINK_COMMAND = g++ -shared    ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
   LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)     ifdef PEGASUS_USE_RELEASE_DIRS
         LINK_COMMAND = $(CXX) -shared
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
      else
         LINK_COMMAND = $(CXX) -shared
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
      endif
     else
       LINK_COMMAND = $(CXX) -dynamiclib
       LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
     endif
     ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
           LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
     endif
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
Line 38 
Line 65 
 endif endif
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = c++ $(FLAGS)    LINK_COMMAND = $(CXX) $(FLAGS)
   LINK_ARGUMENTS = -W "l,XPLINK,dll"   LINK_ARGUMENTS = -W "l,XPLINK,dll"
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
Line 49 
Line 76 
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
   ifdef EXTRA_LINK_FLAGS
     LINK_COMMAND += $(EXTRA_LINK_FLAGS)
   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
Line 61 
Line 92 
     ## 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
     ##     ##
   
   
       ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
           rm -f $(FULL_LIB)
       endif
   
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_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)

Legend:
Removed from v.1.39.4.1  
changed lines
  Added in v.1.60
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2