ICU-1868 Make DEFS be used for macros and includes only for compile

time, not for link time, and other various fixes. X-SVN-Rev: 8562
2002-05-01 23:48:15 +00:00 · 2002-05-01 23:48:15 +00:00 · 9d8d0d3940
commit 9d8d0d3940
parent 277a918e33
33 changed files with 257 additions and 292 deletions
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@ -45,10 +45,10 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-CPPFLAGS += $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
+CPPFLAGS += $(LIBCPPFLAGS)

 # Data packaging options are set at configure time with --with-data-packaging.
-CPPFLAGS += @DATA_PACKAGING_CPPFLAGS@
+DEFS += -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\" @DATA_PACKAGING_CPPFLAGS@

 # todo:  need t make $(LIBICUDT) conditional on using dll-based data.
 LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
--- a/icu4c/source/config/mh-aix
+++ b/icu4c/source/config/mh-aix
@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2002, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-aix,v 1.28 2002/03/21 01:26:39 grhoten-oss Exp $
+## $Id: mh-aix,v 1.29 2002/05/01 23:48:08 grhoten-oss Exp $
 ##
 ## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). 
 ## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1
@ -13,18 +13,20 @@ GEN_DEPS.c=	$(CC) -E -M $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc=	$(CXX) -E -M $(DEFS) $(CPPFLAGS)

 ## Commands to compile
-COMPILE.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -qroconst -c
-COMPILE.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -qroconst -c
+COMPILE.c=	$(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
+COMPILE.cc=	$(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
+
+LDFLAGS += -brtl

 ## Commands to link
 ## We need to use the C++ linker, even when linking C programs, since
 ##  our libraries contain C++ code (C++ static init not called)
-LINK.c=		$(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-LINK.cc=	$(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.c=		$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.cc=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 ## Commands to make a shared library
-SHLIB.c=	$(AIX_SHLIB) -p 5000 -brtl $(LDFLAGS)
-SHLIB.cc=	$(AIX_SHLIB) -p 5000 -brtl $(LDFLAGS)
+SHLIB.c=	$(AIX_SHLIB) -p 5000 $(LDFLAGS)
+SHLIB.cc=	$(AIX_SHLIB) -p 5000 $(LDFLAGS)

 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-I
--- a/icu4c/source/config/mh-aix-va
+++ b/icu4c/source/config/mh-aix-va
@ -3,28 +3,30 @@
 ## Copyright (c) 1999-2002, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-aix-va,v 1.21 2002/03/21 01:26:39 grhoten-oss Exp $
+## $Id: mh-aix-va,v 1.22 2002/05/01 23:48:08 grhoten-oss Exp $

 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -M $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc=	$(CXX) -E -M $(DEFS) $(CPPFLAGS)

 ## Commands to compile
-COMPILE.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -qroconst -c
-COMPILE.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -qroconst -c
+COMPILE.c=	$(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
+COMPILE.cc=	$(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
+
+LDFLAGS += -brtl -bh:5

 ## Commands to link
 ## We need to use the C++ linker, even when linking C programs, since
 ##  our libraries contain C++ code (C++ static init not called)
-LINK.c=		$(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-LINK.cc=	$(CXX) -brtl -bh:5 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.c=		$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.cc=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 ## Commands to make a shared library
 ## -G means -berok -brtl -bnortllib -bnosymbolic -bnoautoexp
 ## -bh:8 means halt on errors or worse.  We don't display warnings about
 ##      duplicate inline symbols.
-SHLIB.c=	$(CXX) -qmkshrobj -G -brtl $(LDFLAGS)
-SHLIB.cc=	$(CXX) -qmkshrobj -G -brtl -bh:5 $(LDFLAGS)
+SHLIB.c=	$(CXX) -qmkshrobj -G $(LDFLAGS)
+SHLIB.cc=	$(CXX) -qmkshrobj -G $(LDFLAGS)

 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-I
--- a/icu4c/source/config/mh-bsd-gcc
+++ b/icu4c/source/config/mh-bsd-gcc
@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2000, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-bsd-gcc,v 1.5 2002/01/04 23:48:42 yves-oss Exp $
+## $Id: mh-bsd-gcc,v 1.6 2002/05/01 23:48:09 grhoten-oss Exp $

 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
@ -14,10 +14,6 @@ SHAREDLIBCFLAGS = -fPIC
 SHAREDLIBCXXFLAGS = -fPIC
 SHAREDLIBCPPFLAGS = -DPIC

-## Commands to make a shared library
-SHLIB.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
-SHLIB.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
-
 ## Compiler switch to embed a runtime search path
 LD_RPATH=	
 LD_RPATH_PRE=	-Wl,-rpath,
@ -26,7 +22,7 @@ LD_RPATH_PRE=	-Wl,-rpath,
 LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)

 ## Shared object suffix
-SO=		so
+SO = so
 ## Non-shared intermediate object suffix
 STATIC_O = ao

@ -45,13 +41,13 @@ STATIC_O = ao
 	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<

 ## Dependency rules
-%.d : $(srcdir)/%.c
+%.d: $(srcdir)/%.c
 	@echo "generating dependency information for $<"
 	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
 		[ -s $@ ] || rm -f $@'

-%.d : $(srcdir)/%.cpp
+%.d: $(srcdir)/%.cpp
 	@echo "generating dependency information for $<"
 	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
--- a/icu4c/source/config/mh-hpux-acc
+++ b/icu4c/source/config/mh-hpux-acc
@ -3,14 +3,14 @@
 ## Copyright (c) 1999-2002, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-hpux-acc,v 1.27 2002/03/14 02:00:36 srl Exp $
+## $Id: mh-hpux-acc,v 1.28 2002/05/01 23:48:10 grhoten-oss Exp $

 ## Commands to generate dependency files
 GEN_DEPS.c=	:
 GEN_DEPS.cc= 	:

 ## Commands to compile
-COMPILE.c=	$(CC)  +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit
+COMPILE.c=	$(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit
 COMPILE.cc=	$(CXX) +z $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c

 ## Common 'default' path to ensure the sanity of users.  Search the current
@ -20,13 +20,13 @@ LD_DEFAULTPATH= -Wl,+b,.:'$$'ORIGIN/
 ## Commands to link
 ## For aCC, use the C++ linker so that __shlinit gets defined
 #LINK.c=		$(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-LINK.c=		$(CXX) +z $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
-LINK.cc=	$(CXX) +z $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
+LINK.c=		$(CXX) +z $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
+LINK.cc=	$(CXX) +z $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)

 ## Commands to make a shared library
 #SHLIB.c=	$(LD) $(LDFLAGS) -b
-SHLIB.c=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)
-SHLIB.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)
+SHLIB.c=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)
+SHLIB.cc=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)

 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-Wl,+b,
--- a/icu4c/source/config/mh-solaris
+++ b/icu4c/source/config/mh-solaris
@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2000, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-solaris,v 1.27 2002/03/12 03:51:04 srl Exp $
+## $Id: mh-solaris,v 1.28 2002/05/01 23:48:08 grhoten-oss Exp $

 ## Flags for position independent code
 SHAREDLIBCFLAGS = -KPIC
@ -15,18 +15,18 @@ GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)

 ## Commands to compile
-COMPILE.c=  $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
-COMPILE.cc= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
+COMPILE.c=  $(CC) -mt $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
+COMPILE.cc= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c

 ## Commands to link
 #LINK.c=		$(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 ## For Sun Workshop, use CC to link to bring in C++ runtime
-LINK.c=		$(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-LINK.cc=	$(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.c=		$(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.cc=	$(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 ## Commands to make a shared library
-SHLIB.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
-SHLIB.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G
+SHLIB.c=	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
+SHLIB.cc=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G

 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-R
--- a/icu4c/source/config/mh-solaris-gcc
+++ b/icu4c/source/config/mh-solaris-gcc
@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2000, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-solaris-gcc,v 1.25 2002/01/04 23:48:43 yves-oss Exp $
+## $Id: mh-solaris-gcc,v 1.26 2002/05/01 23:48:09 grhoten-oss Exp $

 ## Flags for position independent code
 SHAREDLIBCFLAGS = -fPIC
@ -11,16 +11,12 @@ SHAREDLIBCXXFLAGS = -fPIC
 SHAREDLIBCPPFLAGS = -DPIC

 ## Commands to generate dependency files
-GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.c= 	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)

-# Commands to link
-LINK.c=       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-LINK.cc=      $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-
 ## Commands to make a shared library
-SHLIB.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
-SHLIB.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G
+SHLIB.c=	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
+SHLIB.cc=	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G

 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-R
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
 dnl others. All Rights Reserved.
 dnl Stephen F. Booth, heavily modified by Yves and others

-dnl $Id: configure.in,v 1.167 2002/04/26 18:45:16 yves-oss Exp $
+dnl $Id: configure.in,v 1.168 2002/05/01 23:48:08 grhoten-oss Exp $

 dnl Process this file with autoconf to produce a configure script
 AC_INIT(common/unicode/utypes.h)
@ -39,7 +39,6 @@ AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
 UNICODE_VERSION="3.1.1"
 AC_SUBST(UNICODE_VERSION)

-CPPFLAGS="${CPPFLAGS} -I."
 AC_SUBST(CPPFLAGS)

 dnl Checks for programs
--- a/icu4c/source/extra/uconv/Makefile.in
+++ b/icu4c/source/extra/uconv/Makefile.in
@ -43,20 +43,12 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
 ## Target information
 TARGET = uconv

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 ifeq ($(UCONVMSG_STATIC),YES)
 LIBS += -L$(MSGNAME) -l$(MSGNAME)
-CPPFLAGS += -DUCONVMSG_STATIC=$(MSGNAME)
+DEFS += -DUCONVMSG_STATIC=$(MSGNAME)
 UCONVMSG_LIB = $(RESDIR)/lib$(MSGNAME).a

 PKGMODE = static
--- a/icu4c/source/extra/ustdio/Makefile.in
+++ b/icu4c/source/extra/ustdio/Makefile.in
@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n
+CPPFLAGS += $(LIBCPPFLAGS)
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n
 LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)

 OBJECTS = locbund.o loccache.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-CPPFLAGS += $(LIBCPPFLAGS) -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common
+CPPFLAGS += $(LIBCPPFLAGS)
+DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common
 LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

 OBJECTS = ucln_in.o \
--- a/icu4c/source/icudefs.mk.in
+++ b/icu4c/source/icudefs.mk.in
@ -92,7 +92,7 @@ RANLIB = @RANLIB@

 # Various flags for the tools

-DEFS = @DEFS@
+DEFS = -I. @DEFS@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@
@ -115,16 +115,16 @@ ECHO_N = @ECHO_N@
 ECHO_C = @ECHO_C@

 # Commands to compile
-COMPILE.c=    $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
-COMPILE.cc=   $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
+COMPILE.c=    $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
+COMPILE.cc=   $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c

 # Commands to link
-LINK.c=       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-LINK.cc=      $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
+LINK.c=       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+LINK.cc=      $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 # Commands to make a shared library
-SHLIB.c=      $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
-SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
+SHLIB.c=      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
+SHLIB.cc=     $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared

 # Environment variable to set a runtime search path
 LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
--- a/icu4c/source/layout/Makefile.in
+++ b/icu4c/source/layout/Makefile.in
@ -11,9 +11,6 @@ top_builddir = ..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = layout

@ -22,14 +19,10 @@ CLEANFILES = *~ $(DEPS)

 ## Target information

-ENABLE_STATIC = @ENABLE_STATIC@
-ENABLE_SHARED = @ENABLE_SHARED@
-
 TARGET_STUBNAME=le

 ifneq ($(ENABLE_STATIC),)
 TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
-RANLIB = @RANLIB@
 endif

 ifneq ($(ENABLE_SHARED),)
@ -43,17 +36,9 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-#LIBS = $(LIBICUUC) @LIBS@
-LIBS= @LIBS@
+CPPFLAGS += $(LIBCPPFLAGS)
+DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common
+LIBS = $(DEFAULT_LIBS)


 OBJECTS =  loengine.o \
--- a/icu4c/source/stubdata/Makefile.in
+++ b/icu4c/source/stubdata/Makefile.in
@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common 
+CPPFLAGS += $(LIBCPPFLAGS)
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common 

 OBJECTS = stubdata.o

--- a/icu4c/source/test/cintltst/Makefile.in
+++ b/icu4c/source/test/cintltst/Makefile.in
@ -32,7 +32,7 @@ endif
 BUILDDIR := $(shell pwd)/../..

 # we define ICU_UNICODE_VERSION so we can test it
-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
 -DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_PLATFORM_NAME)\" -DU_TOPSRCDIR=\"$(top_srcdir)/\" -DU_TOPBUILDDIR=\"$(BUILDDIR)\"
 LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)

--- a/icu4c/source/test/ieeetest/Makefile.in
+++ b/icu4c/source/test/ieeetest/Makefile.in
@ -19,7 +19,7 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = ieeetest

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common
 LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = ieeetest.o
--- a/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@ -20,7 +20,7 @@ CLEANFILES = *~ $(DEPS)
 TARGET = intltest

 BUILDDIR := $(shell pwd)/../..
-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o		\
--- a/icu4c/source/test/iotest/Makefile.in
+++ b/icu4c/source/test/iotest/Makefile.in
@ -19,10 +19,8 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = iotest

-BUILDDIR := $(shell pwd)/../..
-
-# we define ICU_UNICODE_VERSION so we can test it
-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \
+-I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
 -I$(top_srcdir)/extra/ustdio
 LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(LIBUSTDIO) $(DEFAULT_LIBS) $(LIB_M)

@ -61,7 +59,7 @@ distclean-local: clean-local
 -include Makefile.local

 check-local: all-local
-	TZ=PST8PDT $(INVOKE) ./$(TARGET) $(CINTLTEST_OPTS)
+	TZ=PST8PDT $(INVOKE) ./$(TARGET) $(IOTEST_OPTS)

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
--- a/icu4c/source/tools/ctestfw/Makefile.in
+++ b/icu4c/source/tools/ctestfw/Makefile.in
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = tools/ctestfw

@ -21,14 +18,9 @@ subdir = tools/ctestfw
 CLEANFILES = *~ $(DEPS) $(ALL_TARGETS)

 ## Target information
-#TARGET = libctestfw.$(SO)
-
-ENABLE_STATIC = @ENABLE_STATIC@
-ENABLE_SHARED = @ENABLE_SHARED@

 ifneq ($(ENABLE_STATIC),)
 TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).a
-RANLIB = @RANLIB@
 endif

 ifneq ($(ENABLE_SHARED),)
@ -42,12 +34,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = $(DEFAULT_LIBS)

 OBJECTS = ctest.o

--- a/icu4c/source/tools/genccode/Makefile.in
+++ b/icu4c/source/tools/genccode/Makefile.in
@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
 ## Target information
 TARGET = genccode

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
+CPPFLAGS += $(BIR_CPPFLAGS)
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) $(LIBICUTOOLUTIL)

 OBJECTS = genccode.o
--- a/icu4c/source/tools/gencmn/Makefile.in
+++ b/icu4c/source/tools/gencmn/Makefile.in
@ -29,7 +29,8 @@ CLEANFILES = *~ mkmap.tmp $(DEPS) $(RES_FILES) $(TEST_FILES) $(DECMN_DEP) $(ALL_
 TARGET = gencmn
 DECMN = decmn

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
+CPPFLAGS += $(BIR_CPPFLAGS)
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gencmn.o
--- a/icu4c/source/tools/gencnval/Makefile.in
+++ b/icu4c/source/tools/gencnval/Makefile.in
@ -34,7 +34,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(RES_FILES) $(TEST_FILES)
 ## Target information
 TARGET = gencnval

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gencnval.o
--- a/icu4c/source/tools/gennames/Makefile.in
+++ b/icu4c/source/tools/gennames/Makefile.in
@ -34,7 +34,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
 ## Target information
 TARGET = gennames

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gennames.o
--- a/icu4c/source/tools/gennorm/Makefile.in
+++ b/icu4c/source/tools/gennorm/Makefile.in
@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = gennorm

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gennorm.o store.o
--- a/icu4c/source/tools/genprops/Makefile.in
+++ b/icu4c/source/tools/genprops/Makefile.in
@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = genprops

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = genprops.o props2.o propsvec.o store.o
--- a/icu4c/source/tools/genrb/Makefile.in
+++ b/icu4c/source/tools/genrb/Makefile.in
@ -26,7 +26,7 @@ CLEANFILES = *~ $(MAN_FILES) $(DEPS)
 TARGET = genrb
 DERB = derb

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o \
--- a/icu4c/source/tools/gentest/Makefile.in
+++ b/icu4c/source/tools/gentest/Makefile.in
@ -25,7 +25,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
 ## Target information
 TARGET = gentest

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gentest.o
--- a/icu4c/source/tools/gentz/Makefile.in
+++ b/icu4c/source/tools/gentz/Makefile.in
@ -31,7 +31,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = gentz

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gentz.o
--- a/icu4c/source/tools/genuca/Makefile.in
+++ b/icu4c/source/tools/genuca/Makefile.in
@ -25,7 +25,7 @@ CLEANFILES = *~ $(TARGET).$(SECTION) $(DEPS)
 ## Target information
 TARGET = genuca

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/extra/ustdio -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = genuca.o 
--- a/icu4c/source/tools/makeconv/Makefile.in
+++ b/icu4c/source/tools/makeconv/Makefile.in
@ -31,7 +31,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES)
 ## Target information
 TARGET = makeconv

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = makeconv.o ucnvstat.o genmbcs.o
--- a/icu4c/source/tools/pkgdata/Makefile.in
+++ b/icu4c/source/tools/pkgdata/Makefile.in
@ -28,7 +28,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) mkmap.tmp $(ALL_MAN_FILES)
 ## Target information
 TARGET = pkgdata

-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = pkgdata.o pkgtypes.o gmake.o dllmode.o cmnmode.o filemode.o sttcmode.o
--- a/icu4c/source/tools/toolutil/Makefile.in
+++ b/icu4c/source/tools/toolutil/Makefile.in
@ -35,7 +35,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw
+CPPFLAGS += $(LIBCPPFLAGS)
+DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw
 LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

 OBJECTS = toolutil.o unewdata.o ucmpwrit.o uoptions.o uparse.o ucbuf.o