pegasus/mak/library-windows.mak - diff

Return to library-windows.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/library-windows.mak between version 1.16 and 1.21

version 1.16, 2005/10/14 18:01:45

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

Line 1

#//%2005////////////////////////////////////////////////////////////////////////

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

#//

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

#//

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

FULL_LIB = $(LIB_DIR)/$(LIBRARY)$(LIB_SUFFIX)

FULL_DLL = $(BIN_DIR)/$(LIBRARY)$(DLL)

FULL_EXP = $(BIN_DIR)/$(LIBRARY)$(EXP)

FULL_ILK = $(BIN_DIR)/$(LIBRARY)$(ILK)

FULL_PDB = $(BIN_DIR)/$(LIBRARY)$(PDB)

VERSION_RC = $(ROOT)/mak/version-windows.RC

VERSION_RES = $(ROOT)/mak/version-windows.RES

## ws2_32.lib is needed to get the WINSOCK routines!

Line 51

Line 53

LINKFILE=$(LIB_DIR)/linkfile

$(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)

$(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(ERROR)

ifdef SOURCES1

@ $(ECHO) "Creating $(LINKFILE)"

@ $(RM) $(LINKFILE)

@ $(foreach i, $(OBJECTS), echo $(i) >> $(LINKFILE) $(NL) )

link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) @$(LINKFILE) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) @$(LINKFILE) $(VERSION_RES) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

else

link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)

endif

FILES_TO_CLEAN = \

$(OBJECTS) $(FULL_LIB) $(FULL_DLL) $(FULL_EXP) $(FULL_ILK) $(FULL_PDB) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB) depend.mak depend.mak.bak

$(VERSION_RES): $(VERSION_RC)

@ $(RC) /fo $(VERSION_RES) $(VERSION_RC)

clean-lib: $(ERROR)

mu rm $(FULL_LIB) $(FULL_DLL) $(FULL_EXP)

Legend:

Removed from v.1.16
changed lines
	Added in v.1.21

No CVS admin address has been configured