(file) Return to platform_HPUX_ACC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_HPUX_ACC.mak between version 1.50 and 1.51

version 1.50, 2008/12/02 09:00:01 version 1.51, 2008/12/09 19:11:21
Line 102 
Line 102 
  
 PEGASUS_SUPPORTS_DYNLIB=yes PEGASUS_SUPPORTS_DYNLIB=yes
  
 ifdef PEGASUS_USE_RELEASE_DIRS  ifeq ($(HAS_ICU_DEPENDENCY),true)
   FLAGS += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib  
   ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)  
     FLAGS += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)  
     ifdef OPENSSL_HOME  
       FLAGS += -Wl,+cdp,$(OPENSSL_HOME)/lib:/usr/lib  
     endif  
     ifdef ICU_INSTALL     ifdef ICU_INSTALL
       FLAGS += -Wl,+cdp,$(ICU_INSTALL)/lib:$(PEGASUS_DEST_LIB_DIR)          P1 = $(ICU_INSTALL)/lib:
     endif     endif
   endif   endif
   ifdef PEGASUS_USE_RELEASE_DIRS
       P2 = $(PEGASUS_DEST_LIB_DIR):
 else else
   ifdef PEGASUS_HAS_MESSAGES      P2 = $(LIB_DIR):
   endif
   ACC_LINK_SEARCH_PATH = -Wl,+b$(P1)$(P2)/usr/lib
   
   ifdef PEGASUS_USE_RELEASE_DIRS
       ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
           ACC_LINK_SEARCH_PATH += \
               -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib
           ACC_LINK_SEARCH_PATH += \
               -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)
           ifdef OPENSSL_HOME
             ACC_LINK_SEARCH_PATH += -Wl,+cdp,$(OPENSSL_HOME)/lib:/usr/lib
           endif
     ifdef ICU_INSTALL     ifdef ICU_INSTALL
       FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib            ACC_LINK_SEARCH_PATH += \
                 -Wl,+cdp,$(ICU_INSTALL)/lib:$(PEGASUS_DEST_LIB_DIR)
     endif     endif
   else  
     FLAGS += -Wl,+b$(LIB_DIR):/usr/lib  
   endif   endif
 endif endif
   ACC_LINK_SEARCH_PATH += -Wl,+s
  
 FLAGS += -Wl,+s  FLAGS += $(ACC_LINK_SEARCH_PATH)
  
 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
   FLAGS += -g   FLAGS += -g


Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2