(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.40 and 1.49

version 1.40, 2003/08/06 14:39:10 version 1.49, 2004/08/24 21:34:19
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:$(PEGASUS_DEST_LIB_DIR):/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 13 
Line 17 
     LINK_COMMAND += +DD64 -mt     LINK_COMMAND += +DD64 -mt
   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,+s -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
        ifdef PEGASUS_HAS_SSL
           ifdef PEGASUS_USE_SSL_SHAREDLIB
             LINK_COMMAND += -Wl,+s -Wl,+b$(LIB_DIR):/usr/lib:$(OPENSSL_HOME)/lib
           else
             LINK_COMMAND += -Wl,+s -Wl,+b$(LIB_DIR):/usr/lib
           endif
         else
           LINK_COMMAND += -Wl,+s -Wl,+b$(LIB_DIR):/usr/lib
         endif
       endif
   endif   endif
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
Line 26 
Line 45 
 endif endif
  
 ifeq ($(COMPILER),gnu) ifeq ($(COMPILER),gnu)
     ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
       ifdef PEGASUS_HAS_SSL
         ifdef PEGASUS_USE_SSL_SHAREDLIB
           ifdef PEGASUS_USE_RELEASE_DIRS
             LINK_COMMAND = g++ -shared
             LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Wl,-rpath /usr/lib/pegasus
           else
             LINK_COMMAND = g++ -shared
             LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Wl,-rpath $(OPENSSL_HOME)/lib
           endif
         else
   LINK_COMMAND = g++ -shared   LINK_COMMAND = g++ -shared
   LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)   LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)
         endif
       else
         LINK_COMMAND = g++ -shared
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)
       endif
     else
       LINK_COMMAND = g++ -dynamiclib
       LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
     endif
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
Line 61 
Line 100 
     ## 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.40  
changed lines
  Added in v.1.49
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2