pegasus/mak/shared-library-unix.mak - diff

Return to shared-library-unix.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/shared-library-unix.mak between version 1.10.2.1 and 1.17

version 1.10.2.1, 2008/06/10 15:33:30

version 1.17, 2008/12/02 09:00:01

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.

#//

#//////////////////////////////////////////////////////////////////////////

##==============================================================================

Line 41

Line 39

ifdef PEGASUS_USE_RELEASE_DIRS

ifdef PEGASUS_HAS_MESSAGES

ifdef ICU_INSTALL

LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT)

LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT)

endif

else

LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)

LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)

endif

else

LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)

Line 192

Line 190

rm -f $(FULL_LIB)

endif

ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)

ifeq ($(OS),zos)

$(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS) > lib$(LIBRARY).llst

$(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(EXTRA_LIBRARIES) $(SYS_LIBS) $(DYNAMIC_LIBRARIES) > lib$(LIBRARY).llst

@ $(ZIP) $(FULL_LIB).llst.zip lib$(LIBRARY).llst

@ $(ZIP) -a -m $(FULL_LIB).llst.zip lib$(LIBRARY).llst

## z/OS needs side definition files to link executables to

## dynamic libraries, so we have to copy them into the lib_dir

touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x

touch $(ROOT)/src/$(DIR)/lib$(LIBRARY)$(DYNLIB_SUFFIX)

mv $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)

mv $(ROOT)/src/$(DIR)/lib$(LIBRARY)$(DYNLIB_SUFFIX) $(LIB_DIR)

else

$(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBS)

Legend:

Removed from v.1.10.2.1
changed lines
	Added in v.1.17

No CVS admin address has been configured