pegasus/mak/platform_HPUX_ACC.mak - diff

Return to platform_HPUX_ACC.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_HPUX_ACC.mak between version 1.46 and 1.52

version 1.46, 2008/05/22 17:43:53

version 1.52, 2008/12/16 18:55:36

Line 1

#//%2006////////////////////////////////////////////////////////////////////////

#//%LICENSE////////////////////////////////////////////////////////////////

#//

#// 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

#// 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

#// Source License; you may not use this file except in compliance with the

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// License.

#// EMC Corporation; VERITAS Software Corporation; The Open Group.

#// 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

OS = HPUX

Line 87

Line 85

DEFINES += -DPEGASUS_PURIFY

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

ifdef PEGASUS_HAS_MESSAGES

ifeq ($(PEGASUS_HAS_ICU),true)

MSG_COMPILE = ${ICU_INSTALL}/bin/genrb

MSG_FLAGS =

MSG_SOURCE_EXT = .txt

MSG_COMPILE_EXT = .res

CNV_ROOT_CMD = cnv2rootbundle

SYS_INCLUDES += -I${ICU_INSTALL}/include

EXTRA_LIBRARIES += -L${ICU_INSTALL}/lib -licui18n -licuuc

endif

DEPEND_INCLUDES =

Line 128

Line 102

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

FLAGS += -Wl,+cdp,$(ICU_INSTALL)/lib:$(PEGASUS_DEST_LIB_DIR)

P1 = $(ICU_INSTALL)/lib:

endif

ifdef PEGASUS_USE_RELEASE_DIRS

P2 = $(PEGASUS_DEST_LIB_DIR):

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

FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib

ACC_LINK_SEARCH_PATH += \

-Wl,+cdp,$(ICU_INSTALL)/lib:$(PEGASUS_DEST_LIB_DIR)

endif

else

FLAGS += -Wl,+b$(LIB_DIR):/usr/lib

endif

ACC_LINK_SEARCH_PATH += -Wl,+s

FLAGS += -Wl,+s

FLAGS += $(ACC_LINK_SEARCH_PATH)

ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS

FLAGS += -g

Legend:

Removed from v.1.46
changed lines
	Added in v.1.52

No CVS admin address has been configured