diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index c09e2082b62..755a8a530ca 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Aix-specific setup (for xlC) -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## ## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). @@ -109,7 +109,6 @@ STATIC_O = o ## BIR - bind with internal references [so app data and icu data doesn't collide] BIR_LDFLAGS= -E$(NAME).map -bnoexpall -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES BIR_DEPS= $(NAME).map diff --git a/icu4c/source/config/mh-aix-gcc b/icu4c/source/config/mh-aix-gcc index 54274da27cb..79e68072a05 100644 --- a/icu4c/source/config/mh-aix-gcc +++ b/icu4c/source/config/mh-aix-gcc @@ -1,5 +1,5 @@ ## -*-makefile-*- -## Copyright (c) 2003-2005 IBM, Ken Foskey, and others. All rights reserved. +## Copyright (c) 2003-2006 IBM, Ken Foskey, and others. All rights reserved. ## ## Aix-specific setup (for gcc) ## @@ -114,9 +114,6 @@ STATIC_O = o # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-bE:$(NAME).map,-bnoexpall -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= $(NAME).map diff --git a/icu4c/source/config/mh-alpha-linux-cc b/icu4c/source/config/mh-alpha-linux-cc index 5020add61a8..4687ded8f0a 100644 --- a/icu4c/source/config/mh-alpha-linux-cc +++ b/icu4c/source/config/mh-alpha-linux-cc @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Alpha-Linux-specific setup -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Commands to generate dependency files @@ -78,9 +78,6 @@ STATIC_O = ao # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-alpha-linux-gcc b/icu4c/source/config/mh-alpha-linux-gcc index b21331031ee..a146d8cd3da 100644 --- a/icu4c/source/config/mh-alpha-linux-gcc +++ b/icu4c/source/config/mh-alpha-linux-gcc @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Linux-specific setup -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Commands to generate dependency files @@ -72,9 +72,6 @@ GENCCODE_ASSEMBLY=-a gcc # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-alpha-osf b/icu4c/source/config/mh-alpha-osf index 5ec4c83c6ac..06079fe9ed0 100644 --- a/icu4c/source/config/mh-alpha-osf +++ b/icu4c/source/config/mh-alpha-osf @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Alpha-OSF-specific setup -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Commands to generate dependency files @@ -78,9 +78,6 @@ STATIC_O = ao # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-beos b/icu4c/source/config/mh-beos index b32e2b3b458..0e5691be15e 100644 --- a/icu4c/source/config/mh-beos +++ b/icu4c/source/config/mh-beos @@ -1,6 +1,6 @@ ## -*-makefile-*- ## BeOS-specific setup -## Copyright (c) 2003-2004, International Business Machines Corporation and +## Copyright (c) 2003-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## ## Original author: Andrew Bachmann @@ -96,9 +96,6 @@ STATIC_O = ao # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-cygwin b/icu4c/source/config/mh-cygwin index cc9940e7de5..3e968298982 100644 --- a/icu4c/source/config/mh-cygwin +++ b/icu4c/source/config/mh-cygwin @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Cygwin-specific setup -## Copyright (c) 2001-2005, International Business Machines Corporation and +## Copyright (c) 2001-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Commands to generate dependency files @@ -98,9 +98,6 @@ INSTALL-L=$(INSTALL_PROGRAM) # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux index 8f999674df0..c2cb731f6d6 100644 --- a/icu4c/source/config/mh-linux +++ b/icu4c/source/config/mh-linux @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Linux-specific setup -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Commands to generate dependency files @@ -71,9 +71,6 @@ STATIC_O = ao # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-qnx b/icu4c/source/config/mh-qnx index 213f9d25b66..3d2b350d8ef 100644 --- a/icu4c/source/config/mh-qnx +++ b/icu4c/source/config/mh-qnx @@ -1,6 +1,6 @@ ## -*-makefile-*- ## QNX-specific setup -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## ## Provided By: Chris McKillop <cdm@qnx.com> @@ -85,9 +85,6 @@ FINAL_SO_TARGET = $(MIDDLE_SO_TARGET) # LDflags that pkgdata will use BIR_LDFLAGS= -Wl,-Bsymbolic -# CPPflags for genccode/gencmn -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES - # Dependencies [i.e. map files] for the final library BIR_DEPS= diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index 3ae7f48baa0..25bd8214327 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -1,6 +1,6 @@ ## -*-makefile-*- ## Solaris-specific setup using Sun's compilers -## Copyright (c) 1999-2005, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Flags for position independent code @@ -70,7 +70,6 @@ STATIC_O = o # ifeq (strip $(GENCCODE_ASSEMBLY),) BIR_LDFLAGS= -Wl,-M,$(NAME).map -Wl,-B,symbolic -Wl,-B,eliminate -BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES BIR_DEPS= $(NAME).map endif diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index c44a908f601..920b75fed42 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -1,5 +1,5 @@ ## Makefile.in for ICU - tools/genccode -## Copyright (c) 1999-2005, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Steven R. Loomis @@ -30,7 +30,7 @@ TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) ifneq ($(top_builddir),$(top_srcdir)) CPPFLAGS += -I$(top_builddir)/common endif -CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genccode.o diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index d2c1669ca7e..925ff22cb2a 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -30,7 +30,7 @@ TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) ifneq ($(top_builddir),$(top_srcdir)) CPPFLAGS += -I$(top_builddir)/common endif -CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencmn.o diff --git a/icu4c/source/tools/icupkg/Makefile.in b/icu4c/source/tools/icupkg/Makefile.in index 088a8ecdcdc..761471f6720 100644 --- a/icu4c/source/tools/icupkg/Makefile.in +++ b/icu4c/source/tools/icupkg/Makefile.in @@ -1,5 +1,5 @@ ## Makefile.in for ICU - tools/icupkg -## Copyright (c) 1999-2005, International Business Machines Corporation and +## Copyright (c) 1999-2006, International Business Machines Corporation and ## others. All Rights Reserved. ## Steven R. Loomis @@ -33,7 +33,7 @@ TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) ifneq ($(top_builddir),$(top_srcdir)) CPPFLAGS += -I$(top_builddir)/common endif -CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = icupkg.o