(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.62 and 1.65

version 1.62, 2005/05/12 15:27:28 version 1.65, 2006/01/19 16:58:25
Line 65 
Line 65 
     endif     endif
   endif   endif
   LINK_COMMAND += -Wl,+s   LINK_COMMAND += -Wl,+s
   ifdef PEGASUS_DEBUG    ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
   ifdef PEGASUS_CCOVER   ifdef PEGASUS_CCOVER
Line 78 
Line 78 
 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 = $(CXX) -shared        LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
    else    else
       LINK_COMMAND = $(CXX) -shared        LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
       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
Line 102 
Line 102 
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = $(CXX) $(FLAGS)   LINK_COMMAND = $(CXX) $(FLAGS)
   LINK_ARGUMENTS = -W "l,XPLINK,dll"    LINK_ARGUMENTS = -W "l,XPLINK,dll,EDIT=NO"
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  


Legend:
Removed from v.1.62  
changed lines
  Added in v.1.65

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2