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

version 1.56, 2005/02/07 06:35:42 version 1.60, 2005/03/07 18:10:38
Line 20 
Line 20 
   endif   endif
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
     ifdef PEGASUS_USE_RELEASE_DIRS     ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND += -Wl,+s -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib        LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib
       ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)       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)         LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)
       endif       endif
     else     else
         LINK_COMMAND += -Wl,+s -Wl,+b$(LIB_DIR):/usr/lib          LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/lib
     endif     endif
   endif   endif
     LINK_COMMAND += -Wl,+s
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
Line 41 
Line 42 
 ifeq ($(COMPILER),gnu) ifeq ($(COMPILER),gnu)
   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
    ifdef PEGASUS_USE_RELEASE_DIRS    ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND = g++ -shared        LINK_COMMAND = $(CXX) -shared
       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) $(EXTRA_LINK_ARGUMENTS)        LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
    else    else
       LINK_COMMAND = g++ -shared        LINK_COMMAND = $(CXX) -shared
       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
    endif    endif
   else   else
     LINK_COMMAND = g++ -dynamiclib      LINK_COMMAND = $(CXX) -dynamiclib
     LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl     LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
   endif   endif
   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
Line 75 
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

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