(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.30 and 1.47

version 1.30, 2002/09/01 18:18:23 version 1.47, 2004/06/25 16:45:24
Line 1 
Line 1 
 ifeq ($(COMPILER),xlc) ifeq ($(COMPILER),xlc)
   LINK_COMMAND = xlC_r   LINK_COMMAND = xlC_r
   LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY)    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)
     endif
   LINK_OUT = -o   LINK_OUT = -o
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB), yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB), yes)
     LINK_COMMAND += -G     LINK_COMMAND += -G
Line 9 
Line 13 
  
 ifeq ($(COMPILER),acc) ifeq ($(COMPILER),acc)
   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)
   ifeq ($(HPUX_IA64_VERSION), yes)    ifeq ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)
     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      ifdef PEGASUS_USE_RELEASE_DIRS
         LINK_COMMAND += -Wl,+s -Wl,+b/opt/wbem/lib:/usr/lib
         ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
           LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:/opt/wbem/lib
         endif
       else
        ifdef PEGASUS_HAS_SSL
           ifdef PEGASUS_USE_SSL_SHAREDLIB
             LINK_COMMAND += -Wl,+s -Wl,+b$(LIB_DIR):/usr/lib:$(OPENSSL_HOME)/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 43 
 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_COMMAND = g++ -shared
   LINK_ARGUMENTS =            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_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 39 
Line 76 
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = c++ $(FLAGS)   LINK_COMMAND = c++ $(FLAGS)
   LINK_ARGUMENTS =    LINK_ARGUMENTS = -W "l,XPLINK,dll"
     LINK_OUT = -o
   endif
   
   ifeq ($(COMPILER),CC)
     LINK_COMMAND = CC
     LINK_ARGUMENTS = -G -KPIC -mt -h lib$(LIBRARY).so
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
Line 55 
Line 98 
     ## 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)
Line 63 
Line 112 
         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x         touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x
         cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)         cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
     endif     endif
     ifeq ($(OS),HPUX)  
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX)  
     endif  
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(EXTRA_LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(EXTRA_LIBRARIES)
   endif   endif
       ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
           $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=sl
       endif
       ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
           $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
       endif
       ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
           $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
       endif
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
  
Line 76 
Line 131 
         rm -f $(FULL_LIB)         rm -f $(FULL_LIB)
  
 ln: ln:
         ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).sl          ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX)
  
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)

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