ICU-1868 Consolodate most definitions into icudefs.mk.in

X-SVN-Rev: 8494
2025-04-07 06:25:30 +00:00 · 2002-04-19 02:19:24 +00:00 · 2002-04-19 02:19:24 +00:00 · 78b2d83a32
commit 78b2d83a32
parent c353ded34d
28 changed files with 103 additions and 474 deletions
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@ -7,17 +7,15 @@
 ## Makefile.in for ICU - icu.so
 ## Stephen F. Booth

-## Install directory information
+## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

 top_builddir = ..

+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk

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

@ -26,12 +24,8 @@ CLEANFILES = *~ $(DEPS)

 ## Target information

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

 ifneq ($(ENABLE_SHARED),)
@ -51,31 +45,24 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-
-# todo:  need t make $(LIBICUDT) conditional on using dll-based data.
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUDT) @LIBS@
+CPPFLAGS += $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"

 # Data packaging options are set at configure time with --with-data-packaging.
 CPPFLAGS += @DATA_PACKAGING_CPPFLAGS@

+# todo:  need t make $(LIBICUDT) conditional on using dll-based data.
+LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
+
 OBJECTS = putil.o locmap.o mutex.o umutex.o \
 udata.o ucmndata.o udatamem.o umapfile.o filestrm.o \
 uresbund.o uresdata.o resbund.o cwchar.o uloc.o locid.o uhash.o uhash_us.o \
 ucnv.o ucnv_bld.o ucnv_cb.o ucnv_cnv.o ucnv_err.o ucnv_io.o ucnvlat1.o \
-ucnv_utf.o ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o ucnvbocu.o ucnvisci.o \
+ucnv_utf.o ucnvmbcs.o ucnv2022.o ucnvhz.o ucnv_lmb.o ucnvscsu.o \
+ucnvbocu.o ucnvisci.o \
 unistr.o utf_impl.o ustring.o ustrcase.o cstring.o ustrfmt.o ustrtrns.o \
 normlzr.o unorm.o chariter.o schriter.o uchriter.o uiter.o \
-uchar.o uprops.o bidi.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o ucln_cmn.o \
-uscript.o umemstrm.o ucmp8.o uvector.o digitlst.o \
+uchar.o uprops.o bidi.o ubidi.o ubidiwrt.o ubidiln.o ushape.o unames.o \
+ucln_cmn.o uscript.o umemstrm.o ucmp8.o uvector.o digitlst.o \
 brkiter.o brkdict.o ubrk.o dbbi.o dbbi_tbl.o rbbi.o rbbi_tbl.o \
 unicode.o scsu.o convert.o utrie.o uset.o

--- a/icu4c/source/data/Makefile.in
+++ b/icu4c/source/data/Makefile.in
@ -5,15 +5,13 @@
 ## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-EXEEXT=@EXEEXT@

 # So that you have $(top_builddir)/config.status
 top_builddir = ..

+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk

-include @platform_make_fragment@
-
 ## Build directory information
 # So that  $(top_builddir)/$(subdir) ~= "here"
 subdir = data
--- a/icu4c/source/data/icupkg.inc.in
+++ b/icu4c/source/data/icupkg.inc.in
@ -13,17 +13,11 @@ top_srcdir=@top_srcdir@
 srcdir=@srcdir@
 top_builddir=..

-SHELL=@SHELL@
-CFLAGS=@CFLAGS@ 
-CPPFLAGS=@CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
-CXXFLAGS=@CXXFLAGS@ 
+include $(top_builddir)/icudefs.mk
+
+CPPFLAGS+= -I$(top_builddir)/common -I$(top_srcdir)/common
 LDFLAGS=@LDFLAGS@ 
 FFLAGS=@FFLAGS@
-DEFS=@DEFS@ 
-ENABLE_RPATH=@ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATH_LDFLAGS=$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
 LIBS=@LIBS@ 
 ICULIBS=$(LIBS) -licu-uc -licu-i18n
 exec_prefix=@exec_prefix@
@ -43,11 +37,6 @@ infodir=@infodir@
 mandir=@mandir@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
-CC=@CC@
-CXX=@CXX@
-AIX_SHLIB = @AIX_SHLIB@
-AR = @AR@
-RANLIB = @RANLIB@

 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -84,9 +73,6 @@ platform=@platform@

 ld_rpath_suf=@ld_rpath_suf@

-include $(top_builddir)/icudefs.mk
-include @platform_make_fragment@
-
 subdir = tools/tmp

 ##### Add the following to source/config/Makefile.in
@ -96,25 +82,9 @@ GENCMN=$(top_builddir)/tools/gencmn/gencmn

 LPATHS=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil

-TOOL=env LD_LIBRARY_PATH=$(LPATHS) LIBPATH=$(LPATHS) 
+TOOL=env $(LDLIBRARYPATH_ENVVAR)=$(LPATHS)

 ifeq ($(strip $(PLATFORM)),OS390)
  TOOL=
 endif

-ifeq ($(strip $(PLATFORM)),AIX)
-  TOOL=env LIBPATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),HPUX)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),U_LINUX)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),U_BSD)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
--- a/icu4c/source/extra/Makefile.in
+++ b/icu4c/source/extra/Makefile.in
@ -21,9 +21,6 @@ include $(top_builddir)/icudefs.mk
 ## Build directory information
 subdir = extra

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Files to remove for 'make clean'
 CLEANFILES = *~

--- a/icu4c/source/extra/uconv/pkgdata.inc.in
+++ b/icu4c/source/extra/uconv/pkgdata.inc.in
@ -13,17 +13,10 @@ top_srcdir=@top_srcdir@
 srcdir=@srcdir@
 top_builddir=../..

-SHELL=@SHELL@
-CFLAGS=@CFLAGS@ 
-CPPFLAGS=@CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
-CXXFLAGS=@CXXFLAGS@ 
-LDFLAGS=@LDFLAGS@
+include $(top_builddir)/icudefs.mk
+
+CPPFLAGS+= -I$(top_builddir)/common -I$(top_srcdir)/common
 FFLAGS=@FFLAGS@
-DEFS=@DEFS@ 
-ENABLE_RPATH=@ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATH_LDFLAGS=$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
 LIBS=@LIBS@ 
 ICULIBS=$(LIBS) -licu-uc -licu-i18n
 exec_prefix=@exec_prefix@
@ -43,9 +36,6 @@ infodir=@infodir@
 mandir=@mandir@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
-CC=@CC@
-CXX=@CXX@
-RANLIB=@RANLIB@

 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -82,9 +72,6 @@ platform=@platform@

 ld_rpath_suf=@ld_rpath_suf@

-include $(top_builddir)/icudefs.mk
-include @platform_make_fragment@
-
 subdir = tools/tmp

 ##### Add the following to source/config/Makefile.in
@ -94,25 +81,9 @@ GENCMN=$(top_builddir)/tools/gencmn/gencmn

 LPATHS=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil

-TOOL=env LD_LIBRARY_PATH=$(LPATHS) LIBPATH=$(LPATHS) 
+TOOL=env $(LDLIBRARYPATH_ENVVAR)=$(LPATHS)

 ifeq ($(strip $(PLATFORM)),OS390)
  TOOL=
 endif

-ifeq ($(strip $(PLATFORM)),AIX)
-  TOOL=env LIBPATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),HPUX)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),U_LINUX)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
-ifeq ($(strip $(PLATFORM)),U_BSD)
-  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-endif
-
--- a/icu4c/source/extra/ustdio/Makefile.in
+++ b/icu4c/source/extra/ustdio/Makefile.in
@ -7,17 +7,15 @@
 ## Makefile.in for ICU - extra/ustdio/libustdio.so
 ## Stephen F. Booth

-## Install directory information
+## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

 top_builddir = ../..

+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = extra/ustdio

@ -26,12 +24,8 @@ CLEANFILES = *~ $(DEPS)

 ## Target information

-ENABLE_STATIC = @ENABLE_STATIC@
-ENABLE_SHARED = @ENABLE_SHARED@
-
 ifneq ($(ENABLE_STATIC),)
 TARGET = libustdio$(ICULIBSUFFIX).a
-RANLIB = @RANLIB@
 endif

 ifneq ($(ENABLE_SHARED),)
@ -45,16 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n
-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) $(LIBICUI18N) @LIBS@
+CPPFLAGS += $(LIBCPPFLAGS) -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 \
 uscanf.o uscanf_p.o uscanset.o ustdio.o sprintf.o sprntf_p.o \
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@ -7,20 +7,15 @@
 ## Makefile.in for ICU - icui18n.so
 ## Stephen F. Booth

-SO_TARGET_VERSION = @LIB_VERSION@
-SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
-
-## Install directory information
+## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

 top_builddir = ..

+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk

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

@ -29,12 +24,8 @@ CLEANFILES = *~ $(DEPS)

 ## Target information

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

 ifneq ($(ENABLE_SHARED),)
@ -48,16 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -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@
+CPPFLAGS += $(LIBCPPFLAGS) -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common
+LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

 OBJECTS = ucln_in.o \
 fmtable.o format.o msgfmt.o umsg.o numfmt.o unum.o decimfmt.o dcfmtsym.o \
--- a/icu4c/source/icudefs.mk.in
+++ b/icu4c/source/icudefs.mk.in
@ -82,6 +82,7 @@ ICULIBSUFFIX=@ICULIBSUFFIX@

 # Compiler and tools

+EXEEXT = @EXEEXT@
 CC = @CC@
 CXX = @CXX@
 AIX_SHLIB = @AIX_SHLIB@
@ -89,6 +90,25 @@ AR = @AR@
 ARFLAGS := @ARFLAGS@ $(ARFLAGS)
 RANLIB = @RANLIB@

+# Various flags for the tools
+
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
+DEFAULT_LIBS = @LIBS@
+LIB_M = @LIB_M@
+
+ENABLE_RPATH = @ENABLE_RPATH@
+ifeq ($(ENABLE_RPATH),YES)
+RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
+endif
+LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
+
+# What kind of libraries are we building and linking against?
+ENABLE_STATIC = @ENABLE_STATIC@
+ENABLE_SHARED = @ENABLE_SHARED@
+
 # Echo w/o newline

 ECHO_N = @ECHO_N@
@ -135,3 +155,7 @@ LIBUSTDIO=      -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX)

 # Invoke, set library path for all ICU libraries.
 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$(top_builddir)/extra/ustdio:$(top_builddir)/tools/ctestfw:$(top_builddir)/data/out:$(top_builddir)/data:$(top_builddir)/stubdata/:$$$(LDLIBRARYPATH_ENVVAR)
+
+# Platform-specific setup
+include @platform_make_fragment@
+
--- a/icu4c/source/samples/cal/Makefile.in
+++ b/icu4c/source/samples/cal/Makefile.in
@ -2,17 +2,15 @@
 ## Copyright (c) 1999-2001, International Business Machines Corporation and
 ## others. All Rights Reserved.

-## Install directory information
+## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

+## Install directory information
 top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = samples/cal

@ -22,23 +20,9 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = icucal

-ENABLE_STATIC = @ENABLE_STATIC@
-
-ifneq ($(ENABLE_STATIC),)
 LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif

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

 OBJECTS = uprint.o cal.o
--- a/icu4c/source/samples/date/Makefile.in
+++ b/icu4c/source/samples/date/Makefile.in
@ -24,21 +24,9 @@ TARGET = icudate

 ENABLE_STATIC = @ENABLE_STATIC@

-ifneq ($(ENABLE_STATIC),)
 LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif

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

 OBJECTS = uprint.o date.o
--- a/icu4c/source/stubdata/Makefile.in
+++ b/icu4c/source/stubdata/Makefile.in
@ -4,37 +4,28 @@
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
-## Makefile.in for ICU extras
+## Makefile.in for ICU stubdata
 ## Stephen F. Booth

-SO_TARGET_VERSION = @LIB_VERSION@
-SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
-
-## Install directory information
+## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

 top_builddir = ..

+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk

 ## Build directory information
 subdir = stubdata

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Files to remove for 'make clean'
 CLEANFILES = *~ $(DEPS)

 ## Target information

-ENABLE_STATIC = @ENABLE_STATIC@
-ENABLE_SHARED = @ENABLE_SHARED@
-
 ifneq ($(ENABLE_STATIC),)
 TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX).a
-RANLIB = @RANLIB@
 endif

 ifneq ($(ENABLE_SHARED),)
@ -48,16 +39,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@ 
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -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 = @LIBS@
+CPPFLAGS += $(LIBCPPFLAGS) -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
@ -10,9 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = test/cintltst

@ -22,11 +19,9 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = cintltst

-ENABLE_STATIC = @ENABLE_STATIC@
-
 # Oh, this hurts my sensibility. This is supposedly a C test and we need to
-# link using a C++ compiler?! Better fix this depency on ustring.o and
-# the ostream !@(*$!@.
+# link using a C++ compiler?! This must be done so that C++ static
+# initialization works in the libraries, like mutex.cpp, ustdio and iostream.

 ifneq ($(ENABLE_STATIC),)
 LINK = $(LINK.cc)
@ -34,21 +29,12 @@ else
 LINK = $(LINK.c)
 endif

-DEFS = @DEFS@
-
 BUILDDIR := $(shell pwd)/../..

 # we define ICU_UNICODE_VERSION so we can test it
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
+CPPFLAGS += -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)\"
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@
+LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \
 ccaltst.o ccapitst.o ccolltst.o cconvtst.o ccurrtst.o cdantst.o	\
--- a/icu4c/source/test/ieeetest/Makefile.in
+++ b/icu4c/source/test/ieeetest/Makefile.in
@ -10,9 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = test/ieeetest

@ -22,16 +19,8 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = ieeetest

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -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@ @LIB_M@
+CPPFLAGS += -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
@ -10,9 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = test/intltest

@ -22,18 +19,9 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = intltest

-DEFS = @DEFS@
 BUILDDIR := $(shell pwd)/../..
-CPPFLAGS = @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)"'
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-LDFLAGS = @LDFLAGS@ \
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@
+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)"'
+LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o		\
 caltztst.o canittst.o citrtest.o cntabcol.o cppcnvt.o cputilst.o currcoll.o dacoll.o	\
--- a/icu4c/source/test/iotest/Makefile.in
+++ b/icu4c/source/test/iotest/Makefile.in
@ -10,9 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ## Build directory information
 subdir = test/iotest

@ -22,33 +19,12 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = iotest

-ENABLE_STATIC = @ENABLE_STATIC@
-
-# Oh, this hurts my sensibility. This is supposedly a C test and we need to
-# link using a C++ compiler?! Better fix this depency on ustring.o and
-# the ostream !@(*$!@.
-
-ifneq ($(ENABLE_STATIC),)
-LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif
-
-DEFS = @DEFS@
-
 BUILDDIR := $(shell pwd)/../..

 # we define ICU_UNICODE_VERSION so we can test it
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
+CPPFLAGS += -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
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(LIBUSTDIO) @LIBS@ @LIB_M@
+LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(LIBUSTDIO) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = iotest.o

@ -92,7 +68,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

 $(TARGET) : $(OBJECTS)
-	$(LINK) -o $@ $^ $(LIBS)
+	$(LINK.cc) -o $@ $^ $(LIBS)

 ifeq (,$(MAKECMDGOALS))
 -include $(DEPS)
--- a/icu4c/source/tools/genccode/Makefile.in
+++ b/icu4c/source/tools/genccode/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/genccode

@ -31,16 +28,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
 ## Target information
 TARGET = genccode

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
-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@ @LIB_M@ $(LIBICUTOOLUTIL)
+CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
+LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) $(LIBICUTOOLUTIL)

 OBJECTS = genccode.o

--- a/icu4c/source/tools/gencmn/Makefile.in
+++ b/icu4c/source/tools/gencmn/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/gencmn

@ -32,24 +29,8 @@ CLEANFILES = *~ mkmap.tmp $(DEPS) $(RES_FILES) $(TEST_FILES) $(DECMN_DEP) $(ALL_
 TARGET = gencmn
 DECMN = decmn

-ENABLE_STATIC = @ENABLE_STATIC@
-
-ifneq ($(ENABLE_STATIC),)
-LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif
-
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
+LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

 OBJECTS = gencmn.o
 DECMN_OBJ = decmn.o
@ -96,10 +77,10 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

 $(TARGET) : $(OBJECTS)
-	$(LINK) -o $@ $^ $(LIBS) 
+	$(LINK.cc) -o $@ $^ $(LIBS) 

 $(DECMN) : $(DECMN_OBJ)
-	$(LINK) -o $@ $^ $(LIBS) 
+	$(LINK.cc) -o $@ $^ $(LIBS) 

 # man page
 install-man: install-manx
--- a/icu4c/source/tools/gencnval/Makefile.in
+++ b/icu4c/source/tools/gencnval/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/gencnval

@ -37,16 +34,8 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(RES_FILES) $(TEST_FILES)
 ## Target information
 TARGET = gencnval

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

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

@ -37,17 +34,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
 ## Target information
 TARGET = gennames

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-LDFLAGS = @LDFLAGS@ \
-ENABLE_RPATH = @ENABLE_RPATH@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ##

 SECTION = 8
@ -32,16 +29,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = gennorm

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ##

 SECTION = 8
@ -32,16 +29,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = genprops

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -10,10 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-
-include @platform_make_fragment@
-
 ##

 SECTION = 1
@ -30,35 +26,18 @@ CLEANFILES = *~ $(MAN_FILES) $(DEPS)
 TARGET = genrb
 DERB = derb

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

-ifneq ($(ENABLE_STATIC),)
-LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif
-
-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) $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ 
-
-##OBJECTS = error.o genrb.o ustr.o parse.o read.o write.o list.o	\
-##rblist.o	util.o
-OBJECTS = error.o genrb.o parse.o read.o reslist.o ustr.o util.o  wrtjava.o rle.o
+OBJECTS = error.o genrb.o parse.o read.o reslist.o ustr.o util.o \
+wrtjava.o rle.o
 DERB_OBJ = derb.o

 DEPS = $(OBJECTS:.o=.d)
 DERB_DEPS = $(DERB_OBJ:.o=.d)

 ## List of phony targets
-.PHONY : all all-local install install-local clean clean-local		\
+.PHONY : all all-local install install-local clean clean-local	\
 distclean distclean-local dist dist-local check \
 check-local install-man

@ -96,7 +75,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

 $(TARGET) : $(OBJECTS)
-	$(LINK) -o $@ $^ $(LIBS) 
+	$(LINK.cc) -o $@ $^ $(LIBS) 

 $(DERB) : $(DERB_OBJ)
 	$(LINK) -o $@ $^ $(LIBS) 
--- a/icu4c/source/tools/gentest/Makefile.in
+++ b/icu4c/source/tools/gentest/Makefile.in
@ -12,9 +12,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

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

@ -28,16 +25,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
 ## Target information
 TARGET = gentest

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ##

 SECTION = 8
@ -34,16 +31,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
 ## Target information
 TARGET = gentz

-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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -10,10 +10,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-
-include @platform_make_fragment@
-
 ##

 SECTION = 8
@ -29,18 +25,8 @@ CLEANFILES = *~ $(TARGET).$(SECTION) $(DEPS)
 ## Target information
 TARGET = genuca

-ENABLE_STATIC = @ENABLE_STATIC@
-
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/extra/ustdio -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) $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ 
+CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/extra/ustdio -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
@ -11,9 +11,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

-## Platform-specific setup
-include @platform_make_fragment@
-
 ##

 SECTION = 1
@ -34,24 +31,8 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES)
 ## Target information
 TARGET = makeconv

-ENABLE_STATIC = @ENABLE_STATIC@
-
-ifneq ($(ENABLE_STATIC),)
-LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif
-
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -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 = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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

@ -106,7 +87,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

 $(TARGET): $(OBJECTS)
-	$(LINK) -o $@ $^ $(LIBS)
+	$(LINK.cc) -o $@ $^ $(LIBS)

 install-man: install-manx
 install-manx: $(MANX_FILES)
--- a/icu4c/source/tools/pkgdata/Makefile.in
+++ b/icu4c/source/tools/pkgdata/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/pkgdata

@ -31,15 +28,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) mkmap.tmp $(ALL_MAN_FILES)
 ## Target information
 TARGET = pkgdata

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\"  -DSTATIC_O=\"$(STATIC_O)\"
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@
+CPPFLAGS += -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
@ -4,9 +4,6 @@
 ## Makefile.in for ICU - tools/toolutil
 ## Steven R. Loomis

-SO_TARGET_VERSION = @LIB_VERSION@
-SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
-
 ## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@ -15,9 +12,6 @@ top_builddir = ../..

 include $(top_builddir)/icudefs.mk

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

@ -26,13 +20,8 @@ CLEANFILES = *~ $(DEPS)

 ## Target information

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

 ifneq ($(ENABLE_SHARED),)
@ -46,16 +35,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)

-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw
-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@ 
+CPPFLAGS += $(LIBCPPFLAGS) -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