(file) Return to shared-library-unix.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/shared-library-unix.mak between version 1.20 and 1.20.6.1

version 1.20, 2009/03/17 04:48:52 version 1.20.6.1, 2013/06/03 22:34:47
Line 88 
Line 88 
 ifeq ($(COMPILER),gnu) ifeq ($(COMPILER),gnu)
   ifeq ($(HAS_ICU_DEPENDENCY),true)   ifeq ($(HAS_ICU_DEPENDENCY),true)
     ifdef ICU_INSTALL     ifdef ICU_INSTALL
         ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_GNU)
           EXTRA_LINK_ARGUMENTS += -Xlinker $(ICU_INSTALL)/lib
         else
       EXTRA_LINK_ARGUMENTS += -Xlinker -rpath -Xlinker $(ICU_INSTALL)/lib       EXTRA_LINK_ARGUMENTS += -Xlinker -rpath -Xlinker $(ICU_INSTALL)/lib
     endif     endif
   endif   endif
     endif
   ifneq ($(OS),darwin)   ifneq ($(OS),darwin)
    ifdef PEGASUS_USE_RELEASE_DIRS    ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
Line 107 
Line 111 
   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
   endif   endif
     ifeq ($(OS), HPUX)
       LINK_COMMAND += -pthread -Wl,+rpathfirst
       LINK_ARGUMENTS = -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
     endif
     ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
         LINK_COMMAND += $(GNU_LINK_SEARCH_PATH)
     endif
     LINK_OUT = -o
   endif
   ##==============================================================================
   ##
   ## llvm/clang compiler
   ## change for other platform like windows
   ##
   ##==============================================================================
   
   ifeq ($(COMPILER),clang)
     ifeq ($(HAS_ICU_DEPENDENCY),true)
       ifdef ICU_INSTALL
         EXTRA_LINK_ARGUMENTS += -Xlinker -rpath -Xlinker $(ICU_INSTALL)/lib
       endif
     endif
     ifdef PEGASUS_USE_RELEASE_DIRS
         LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath \
             -Xlinker $(PEGASUS_DEST_LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
     else
         LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
         LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
     endif
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
Line 201 
Line 235 
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=sl             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=sl
     endif     endif
       ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_GNU)
           $(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)     ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
     endif     endif
       ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_GNU)
           $(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     ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \         $(MAKE) --directory=$(LIB_DIR) -f $(PEGASUS_ROOT)/mak/library-unix.mak \
             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so             ln LIBRARY=lib$(LIBRARY) SUFFIX=$(LIB_SUFFIX) PLATFORM_SUFFIX=so
Line 244 
Line 286 
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC) ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).sl     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).sl
 endif endif
   ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_GNU)
       FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).sl
   endif
 ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC) ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so
 endif endif
   ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_GNU)
       FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so
   endif
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so     FILES_TO_CLEAN += $(LIB_DIR)/lib$(LIBRARY).so
 endif endif


Legend:
Removed from v.1.20  
changed lines
  Added in v.1.20.6.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2