(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.43.32.1 and 1.53

version 1.43.32.1, 2007/02/16 19:27:43 version 1.53, 2009/03/17 04:48:52
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 MAJOR_VERSION_NUMBER = 1 MAJOR_VERSION_NUMBER = 1
  
 OS = HPUX OS = HPUX
Line 75 
Line 73 
  
 DEFINES += -DPEGASUS_USE_SYSLOGS DEFINES += -DPEGASUS_USE_SYSLOGS
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  
   
 ifdef PEGASUS_USE_EMANATE ifdef PEGASUS_USE_EMANATE
  DEFINES += -DHPUX_EMANATE  DEFINES += -DHPUX_EMANATE
 endif endif
Line 89 
Line 85 
  DEFINES += -DPEGASUS_PURIFY  DEFINES += -DPEGASUS_PURIFY
 endif endif
  
 ##  
 ## The following flags need to be set or unset  
 ## to compile-in the code required for PAM authentication  
 ## and compile-out the code that uses the password file.  
 ##  
   
 ifdef PEGASUS_PAM_AUTHENTICATION  
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  
 endif  
   
 # l10n  
 ifdef PEGASUS_HAS_MESSAGES  
   DEFINES += -DPEGASUS_HAS_MESSAGES  
   ifdef ICU_ROOT  
         MSG_COMPILE = ${ICU_INSTALL}/bin/genrb  
         MSG_FLAGS =  
         MSG_SOURCE_EXT = .txt  
         MSG_COMPILE_EXT = .res  
         CNV_ROOT_CMD = cnv2rootbundle  
   
 ##################################  
 ##  
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root  
 ## resource bundle, default is to uppercase the root resource bundle^M  
 ##  
 ##################################  
   
 ifdef ICU_NO_UPPERCASE_ROOT  
   CNV_ROOT_FLAGS =  
 else  
   CNV_ROOT_FLAGS = -u  
 endif  
   
 ####################################  
 ##  
 ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource  
 ## bundle will be generated from defaults to _en if not set.  if set, for  
 ## any directory containing resource bundles, there must exist a file name:  
 ## package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages  
 ## target will fail  
 ##  
 ####################################  
   
 ifdef ICU_ROOT_BUNDLE_LANG  
   MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)  
 else  
   MSG_ROOT_SOURCE = _en  
 endif  
   
     SYS_INCLUDES += -I${ICU_ROOT}/source/common  
     SYS_INCLUDES += -I${ICU_ROOT}/source/i18n  
     DEFINES += -DPEGASUS_HAS_ICU  
     ifdef ICU_INSTALL  
       EXTRA_LIBRARIES += -L${ICU_INSTALL}/lib -licui18n -licuuc  
     endif  
   endif  
 endif  
   
   
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
  
Line 165 
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):
     ifdef ICU_ROOT  
       ifdef ICU_INSTALL  
         FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib  
       endif       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
             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 +noobjdebug
 else else
   FLAGS += +O2 -s   FLAGS += +O2 -s
 endif endif

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