tools/crosstools/icu4c-60_2-src-aros.diff

   1 diff -ruN icu/source/common/Makefile.in icu.aros/source/common/Makefile.in
   2 --- icu/source/common/Makefile.in       2017-10-11 18:24:35.000000000 +0200
   3 +++ icu.aros/source/common/Makefile.in  2018-03-20 21:55:05.122610455 +0100
   4 @@ -33,7 +33,7 @@
   5  TARGET_STUBNAME=$(COMMON_STUBNAME)
   6
   7  ifneq ($(ENABLE_STATIC),)
   8 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
   9 +COMMONTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
  10  endif
  11
  12  ifneq ($(ENABLE_SHARED),)
  13 @@ -51,7 +51,7 @@
  14
  15  endif   # ENABLE_SHARED
  16
  17 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
  18 +ALL_TARGETS = $(COMMONTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
  19
  20  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
  21  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
  22 @@ -150,7 +150,7 @@
  23  install-library: all-local
  24         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
  25  ifneq ($(ENABLE_STATIC),)
  26 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
  27 +       $(INSTALL-L) $(COMMONTARGET) $(DESTDIR)$(libdir)
  28  endif
  29  ifneq ($(ENABLE_SHARED),)
  30         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
  31 @@ -202,7 +202,7 @@
  32          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  33
  34  ifneq ($(ENABLE_STATIC),)
  35 -$(TARGET): $(STATIC_OBJECTS)
  36 +$(COMMONTARGET): $(STATIC_OBJECTS)
  37         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
  38         $(RANLIB) $@
  39  endif
  40 diff -ruN icu/source/common/putilimp.h icu.aros/source/common/putilimp.h
  41 --- icu/source/common/putilimp.h        2017-10-11 18:24:35.000000000 +0200
  42 +++ icu.aros/source/common/putilimp.h   2018-03-15 00:25:28.000000000 +0100
  43 @@ -101,7 +101,7 @@
  44  #if U_PLATFORM_HAS_WINUWP_API == 0
  45  #   define U_TZSET _tzset
  46  #endif
  47 -#elif U_PLATFORM == U_PF_OS400
  48 +#elif U_PLATFORM == U_PF_OS400 || defined(__AROS__)
  49     /* not defined */
  50  #else
  51  #   define U_TZSET tzset
  52 @@ -139,7 +139,7 @@
  53  #if U_PLATFORM_HAS_WINUWP_API == 0
  54  #   define U_TZNAME _tzname
  55  #endif
  56 -#elif U_PLATFORM == U_PF_OS400
  57 +#elif U_PLATFORM == U_PF_OS400 || defined(__AROS__)
  58     /* not defined */
  59  #else
  60  #   define U_TZNAME tzname
  61 diff -ruN icu/source/common/unicode/umachine.h icu.aros/source/common/unicode/umachine.h
  62 --- icu/source/common/unicode/umachine.h        2017-03-15 19:09:01.000000000 +0100
  63 +++ icu.aros/source/common/unicode/umachine.h   2018-03-14 18:56:55.000000000 +0100
  64 @@ -282,6 +282,10 @@
  65  #       define U_WCHAR_IS_UTF32
  66  #   elif U_PLATFORM_HAS_WIN32_API
  67  #       define U_WCHAR_IS_UTF16
  68 +#   elif defined(__AROS__)
  69 +#       if (U_SIZEOF_WCHAR_T==4)
  70 +#           define U_WCHAR_IS_UTF32
  71 +#       endif
  72  #   endif
  73  #endif
  74
  75 diff -ruN icu/source/config/mh-aros icu.aros/source/config/mh-aros
  76 --- icu/source/config/mh-aros   1970-01-01 01:00:00.000000000 +0100
  77 +++ icu.aros/source/config/mh-aros      2018-03-10 04:16:05.000000000 +0100
  78 @@ -0,0 +1,76 @@
  79 +## AROS-specific setup
  80 +
  81 +## Commands to generate dependency files
  82 +GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPFLAGS)
  83 +GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
  84 +
  85 +## Flags for position independent code
  86 +SHAREDLIBCFLAGS =
  87 +SHAREDLIBCXXFLAGS =
  88 +SHAREDLIBCPPFLAGS =
  89 +
  90 +## Additional flags when building libraries and with threads
  91 +THREADSCPPFLAGS = -D_REENTRANT
  92 +LIBCPPFLAGS =
  93 +
  94 +## Compiler switch to embed a runtime search path
  95 +LD_RPATH=
  96 +LD_RPATH_PRE = -Wl,-rpath,
  97 +
  98 +## These are the library specific LDFLAGS
  99 +LDFLAGSICUDT=-nodefaultlibs -nostdlib
 100 +
 101 +## Compiler switch to embed a library name
 102 +LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
 103 +
 104 +## Shared object suffix
 105 +SO = so
 106 +## Non-shared intermediate object suffix
 107 +STATIC_O = ao
 108 +
 109 +## Compilation rules
 110 +%.$(STATIC_O): $(srcdir)/%.c
 111 +       $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
 112 +%.o: $(srcdir)/%.c
 113 +       $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 114 +
 115 +%.$(STATIC_O): $(srcdir)/%.cpp
 116 +       $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
 117 +%.o: $(srcdir)/%.cpp
 118 +       $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 119 +
 120 +
 121 +## Dependency rules
 122 +%.d: $(srcdir)/%.c
 123 +       @echo "generating dependency information for $<"
 124 +       @$(SHELL) -ec '$(GEN_DEPS.c) $< \
 125 +               | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
 126 +               [ -s $@ ] || rm -f $@'
 127 +
 128 +%.d: $(srcdir)/%.cpp
 129 +       @echo "generating dependency information for $<"
 130 +       @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
 131 +               | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
 132 +               [ -s $@ ] || rm -f $@'
 133 +
 134 +## Versioned libraries rules
 135 +
 136 +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
 137 +       $(RM) $@ && ln -s ${<F} $@
 138 +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
 139 +       $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 140 +
 141 +##  Bind internal references
 142 +
 143 +# LDflags that pkgdata will use
 144 +BIR_LDFLAGS= -Wl,-Bsymbolic
 145 +
 146 +# Dependencies [i.e. map files] for the final library
 147 +BIR_DEPS=
 148 +
 149 +## Remove shared library 's'
 150 +STATIC_PREFIX_WHEN_USED =
 151 +STATIC_PREFIX =
 152 +
 153 +## End AROS-specific setup
 154 +
 155 diff -ruN icu/source/configure icu.aros/source/configure
 156 --- icu/source/configure        2017-10-11 18:24:34.000000000 +0200
 157 +++ icu.aros/source/configure   2018-03-13 00:57:01.000000000 +0100
 158 @@ -5212,6 +5212,7 @@
 159  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
 160  *-*-nto*)      icu_cv_host_frag=mh-qnx ;;
 161  *-ncr-*)       icu_cv_host_frag=mh-mpras ;;
 162 +*-*-aros)      icu_cv_host_frag=mh-aros ;;
 163  *)             icu_cv_host_frag=mh-unknown ;;
 164  esac
 165
 166 diff -ruN icu/source/data/Makefile.in icu.aros/source/data/Makefile.in
 167 --- icu/source/data/Makefile.in 2016-12-07 02:45:05.000000000 +0100
 168 +++ icu.aros/source/data/Makefile.in    2018-03-20 22:47:16.270025509 +0100
 169 @@ -49,7 +49,7 @@
 170  ifeq ($(OS390BATCH),1)
 171  PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -z -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
 172  else
 173 -PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
 174 +PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURR_FULL_DIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
 175  endif
 176  OS390_PDS_NAME = -z -L $(BATCH_STUB_TARGET)
 177
 178 @@ -81,28 +81,28 @@
 179
 180  OUTTMPDIR=$(OUTDIR)/tmp
 181  MAINBUILDDIR=$(OUTDIR)/build
 182 -BUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
 183 +DATABUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
 184  UNICODEDATADIR=$(SRCDATADIR)/unidata
 185  LOCSRCDIR=$(SRCDATADIR)/locales
 186  CURRSRCDIR=$(SRCDATADIR)/curr
 187 -CURRBLDDIR=$(BUILDDIR)/curr
 188 +CURRBLDDIR=$(DATABUILDDIR)/curr
 189  LANGSRCDIR=$(SRCDATADIR)/lang
 190 -LANGBLDDIR=$(BUILDDIR)/lang
 191 +LANGBLDDIR=$(DATABUILDDIR)/lang
 192  REGIONSRCDIR=$(SRCDATADIR)/region
 193 -REGIONBLDDIR=$(BUILDDIR)/region
 194 +REGIONBLDDIR=$(DATABUILDDIR)/region
 195  ZONESRCDIR=$(SRCDATADIR)/zone
 196 -ZONEBLDDIR=$(BUILDDIR)/zone
 197 +ZONEBLDDIR=$(DATABUILDDIR)/zone
 198  UNITSRCDIR=$(SRCDATADIR)/unit
 199 -UNITBLDDIR=$(BUILDDIR)/unit
 200 +UNITBLDDIR=$(DATABUILDDIR)/unit
 201  COLSRCDIR=$(SRCDATADIR)/coll
 202 -COLBLDDIR=$(BUILDDIR)/coll
 203 +COLBLDDIR=$(DATABUILDDIR)/coll
 204  RBNFSRCDIR=$(SRCDATADIR)/rbnf
 205 -RBNFBLDDIR=$(BUILDDIR)/rbnf
 206 +RBNFBLDDIR=$(DATABUILDDIR)/rbnf
 207  TRANSLITSRCDIR=$(SRCDATADIR)/translit
 208 -TRANSLITBLDDIR=$(BUILDDIR)/translit
 209 +TRANSLITBLDDIR=$(DATABUILDDIR)/translit
 210  MISCSRCDIR=$(SRCDATADIR)/misc
 211  BRKSRCDIR=$(SRCDATADIR)/brkitr
 212 -BRKBLDDIR=$(BUILDDIR)/brkitr
 213 +BRKBLDDIR=$(DATABUILDDIR)/brkitr
 214  DICTSRCDIR=$(BRKSRCDIR)/dictionaries
 215  BRKRULESRCDIR=$(BRKSRCDIR)/rules
 216  MISCSRCDIR=$(SRCDATADIR)/misc
 217 @@ -110,7 +110,7 @@
 218  SPREPSRCDIR=$(SRCDATADIR)/sprep
 219  COMINCDIR=$(top_srcdir)/common/unicode
 220  SRCLISTDEPS=Makefile $(srcdir)/Makefile.in
 221 -BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(BUILDDIR) $(CURRBLDDIR) $(LANGBLDDIR) $(REGIONBLDDIR) $(ZONEBLDDIR) $(UNITBLDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(CURR_TREE) $(OUTTMPDIR)/$(LANG_TREE) $(OUTTMPDIR)/$(REGION_TREE) $(OUTTMPDIR)/$(ZONE_TREE) $(OUTTMPDIR)/$(UNIT_TREE) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
 222 +BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(DATABUILDDIR) $(CURRBLDDIR) $(LANGBLDDIR) $(REGIONBLDDIR) $(ZONEBLDDIR) $(UNITBLDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(CURR_TREE) $(OUTTMPDIR)/$(LANG_TREE) $(OUTTMPDIR)/$(REGION_TREE) $(OUTTMPDIR)/$(ZONE_TREE) $(OUTTMPDIR)/$(UNIT_TREE) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
 223
 224  # relative lib links from pkgdata are the same as for tmp
 225  TOOLDIR=$(top_builddir)/tools
 226 @@ -213,11 +213,11 @@
 227  endif
 228  ifneq ($(ENABLE_STATIC),)
 229  ifeq ($(PKGDATA_MODE),dll)
 230 -       $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
 231 +       $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(DATABUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
 232  endif
 233  endif
 234  ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
 235 -       $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR)
 236 +       $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(DATABUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR)
 237  else
 238         $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR)
 239  endif
 240 @@ -228,7 +228,7 @@
 241  #### 390 support
 242  install390: package390
 243         $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
 244 -       $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
 245 +       $(INVOKE) $(PKGDATA) -s $(DATABUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
 246  ifeq ($(PKGDATA_MODE),dll)
 247         $(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB)
 248  endif
 249 @@ -236,7 +236,7 @@
 250  #### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode
 251  package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
 252         ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX)
 253 -       $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING)
 254 +       $(INVOKE) $(PKGDATA) -s $(DATABUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING)
 255         cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO)
 256
 257
 258 @@ -251,7 +251,7 @@
 259  # These are now hardcoded in ICU4C and only loaded in ICU4J.
 260  #
 261  DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm
 262 -DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
 263 +DAT_FILES=$(DAT_FILES_SHORT:%=$(DATABUILDDIR)/%)
 264
 265  ## BRK files
 266  BREAK_TREE=brkitr
 267 @@ -274,7 +274,7 @@
 268  ## Confusables (Spoofing) files
 269  ALL_CFU_SOURCE=$(UNICODEDATADIR)/confusables.txt $(UNICODEDATADIR)/confusablesWholeScript.txt
 270  CFU_FILES_SHORT=confusables.cfu
 271 -CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT)
 272 +CFU_FILES=$(DATABUILDDIR)/$(CFU_FILES_SHORT)
 273
 274  ## UCM files
 275  -include $(UCMSRCDIR)/ucmcore.mk
 276 @@ -283,11 +283,11 @@
 277  -include $(UCMSRCDIR)/ucmlocal.mk
 278  ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
 279  UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
 280 -CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
 281 +CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(DATABUILDDIR)/%.cnv)
 282  CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
 283  UCM_SOURCE_SPECIAL=$(UCM_SOURCE_EBCDIC_IGNORE_SISO) $(UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL)
 284  UCM_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:%=$(UCMSRCDIR)/%)
 285 -CNV_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:%.ucm=$(BUILDDIR)/%.cnv)
 286 +CNV_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:%.ucm=$(DATABUILDDIR)/%.cnv)
 287  CNV_FILES_SHORT_SPECIAL=$(UCM_SOURCE_SPECIAL:%.ucm=%.cnv)
 288
 289  ## RES files
 290 @@ -379,7 +379,7 @@
 291  INDEX_FILE=$(OUTTMPDIR)/$(INDEX_NAME).txt
 292
 293  ALL_RES_SRC= $(RES_SRC) $(TRNS_SOURCE) $(MSC_SOURCE)
 294 -RES_FILES = $(ALL_RES_SRC:%.txt=$(BUILDDIR)/%.res) $(BUILDDIR)/$(INDEX_NAME).res $(BUILDDIR)/pool.res
 295 +RES_FILES = $(ALL_RES_SRC:%.txt=$(DATABUILDDIR)/%.res) $(DATABUILDDIR)/$(INDEX_NAME).res $(DATABUILDDIR)/pool.res
 296  RES_FILES_SHORT = $(ALL_RES_SRC:%.txt=%.res) $(INDEX_NAME).res pool.res
 297  PKGDATA_LIST = $(OUTTMPDIR)/icudata.lst
 298
 299 @@ -439,7 +439,7 @@
 300  -include $(SPREPSRCDIR)/sprepfiles.mk
 301  -include $(SPREPSRCDIR)/spreplocal.mk
 302  ALL_SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL)
 303 -SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(BUILDDIR)/%.spp)
 304 +SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(DATABUILDDIR)/%.spp)
 305  SPREP_FILES_SHORT = $(ALL_SPREP_SOURCE:%.txt=%.spp)
 306
 307  ## All generated files
 308 @@ -451,7 +451,7 @@
 309  LOCALE_FILES_LIST= $(RES_FILES_SHORT) $(LANG_FILES_SHORT) $(REGION_FILES_SHORT) $(ZONE_FILES_SHORT) $(UNIT_FILES_SHORT)
 310  MISC_FILES_LIST=$(DAT_FILES_SHORT) $(CNV_FILES_SHORT) $(CNV_FILES_SHORT_SPECIAL) $(CURR_FILES_SHORT) $(RBNF_FILES_SHORT) $(RBNF_INDEX_RES_SHORT) $(TRANSLIT_FILES_SHORT) $(SPREP_FILES_SHORT) $(CFU_FILES_SHORT)
 311  UNI_CORE_DATA=pnames.icu uprops.icu ucase.icu ubidi.icu nfc.nrm
 312 -UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(BUILDDIR)/%)
 313 +UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(DATABUILDDIR)/%)
 314
 315  ifneq ($(INCLUDE_UNI_CORE_DATA),)
 316  MISC_FILES_LIST+=$(UNI_CORE_DATA)
 317 @@ -490,7 +490,7 @@
 318  ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
 319         @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
 320         @-$(RMV) $@
 321 -       $(INVOKE) $(TOOLBINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) -o $@
 322 +       $(INVOKE) $(TOOLBINDIR)/icupkg -d $(DATABUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) -o $@
 323  else
 324         @echo "$@" > $@
 325  endif
 326 @@ -523,30 +523,30 @@
 327  # DAT FILES
 328
 329  # cnvalias.icu
 330 -$(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(TOOLBINDIR)/gencnval$(TOOLEXEEXT)
 331 -       $(INVOKE) $(TOOLBINDIR)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
 332 +$DATABUILDDIR/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(TOOLBINDIR)/gencnval$(TOOLEXEEXT)
 333 +       $(INVOKE) $(TOOLBINDIR)/gencnval -d $(DATABUILDDIR) $(UCMSRCDIR)/convrtrs.txt
 334
 335  # Targets for prebuilt Unicode data
 336 -$(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu
 337 +$(DATABUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu
 338         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
 339
 340 -$(BUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm
 341 +$(DATABUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm
 342         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
 343
 344 -$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu
 345 +$(DATABUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu
 346         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
 347
 348  ####################################################    SPP
 349  # SPP FILES
 350
 351 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/unames.icu
 352 -       $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
 353 +$(DATABUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(DATABUILDDIR)/unames.icu
 354 +       $(INVOKE) $(TOOLBINDIR)/gensprep -d $(DATABUILDDIR) -i $(DATABUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
 355
 356  ####################################################    BRK
 357  # BRK FILES
 358
 359  $(BRKBLDDIR)/%.brk: $(BRKRULESRCDIR)/%.txt $(TOOLBINDIR)/genbrk$(TOOLEXEEXT) $(DAT_FILES)
 360 -       $(INVOKE) $(TOOLBINDIR)/genbrk -c -i $(BUILDDIR) -r $< -o $@
 361 +       $(INVOKE) $(TOOLBINDIR)/genbrk -c -i $(DATABUILDDIR) -r $< -o $@
 362
 363  ####################################################    DICT
 364  # DICT FILES
 365 @@ -554,20 +554,20 @@
 366  # .dict file generated regardless of whether dictionary file exists
 367
 368  $(BRKBLDDIR)/%.dict: $(TOOLBINDIR)/gendict$(TOOLEXEEXT) $(DAT_FILES)
 369 -       $(INVOKE) $(TOOLBINDIR)/gendict --uchars -c -i $(BUILDDIR) $(DICTSRCDIR)/$(*F).txt $@
 370 +       $(INVOKE) $(TOOLBINDIR)/gendict --uchars -c -i $(DATABUILDDIR) $(DICTSRCDIR)/$(*F).txt $@
 371
 372  $(BRKBLDDIR)/thaidict.dict: $(TOOLBINDIR)/gendict$(TOOLEXEEXT) $(DAT_FILES)
 373 -       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x0e00 -c -i $(BUILDDIR) $(DICTSRCDIR)/thaidict.txt $(BRKBLDDIR)/thaidict.dict
 374 +       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x0e00 -c -i $(DATABUILDDIR) $(DICTSRCDIR)/thaidict.txt $(BRKBLDDIR)/thaidict.dict
 375
 376  $(BRKBLDDIR)/laodict.dict: $(TOOLBINDIR)/gendict$(TOOLEXEEXT) $(DAT_FILES)
 377 -       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x0e80 -c -i $(BUILDDIR) $(DICTSRCDIR)/laodict.txt $(BRKBLDDIR)/laodict.dict
 378 +       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x0e80 -c -i $(DATABUILDDIR) $(DICTSRCDIR)/laodict.txt $(BRKBLDDIR)/laodict.dict
 379
 380  $(BRKBLDDIR)/burmesedict.dict: $(TOOLBINDIR)/gendict$(TOOLEXEEXT) $(DAT_FILES)
 381 -       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x1000 -c -i $(BUILDDIR) $(DICTSRCDIR)/burmesedict.txt $(BRKBLDDIR)/burmesedict.dict
 382 +       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x1000 -c -i $(DATABUILDDIR) $(DICTSRCDIR)/burmesedict.txt $(BRKBLDDIR)/burmesedict.dict
 383
 384  # TODO: figure out why combining characters are here?
 385  $(BRKBLDDIR)/khmerdict.dict: $(TOOLBINDIR)/gendict$(TOOLEXEEXT) $(DAT_FILES)
 386 -       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x1780 -c -i $(BUILDDIR) $(DICTSRCDIR)/khmerdict.txt $(BRKBLDDIR)/khmerdict.dict
 387 +       $(INVOKE) $(TOOLBINDIR)/gendict --bytes --transform offset-0x1780 -c -i $(DATABUILDDIR) $(DICTSRCDIR)/khmerdict.txt $(BRKBLDDIR)/khmerdict.dict
 388
 389  ####################################################    CFU
 390  # CFU FILES
 391 @@ -580,22 +580,22 @@
 392         $(INVOKE) echo ALL_CFU_SOURCE: $(ALL_CFU_SOURCE)
 393         $(INVOKE) echo CFU_FILES: $(CFU_FILES)
 394         $(INVOKE) echo CFU_FILES_SHORT: $(CFU_FILES_SHORT)
 395 -       $(INVOKE) $(TOOLBINDIR)/gencfu -c -i $(BUILDDIR) -r $(word 1,$(ALL_CFU_SOURCE)) -w $(word 2,$(ALL_CFU_SOURCE)) -o $@
 396 +       $(INVOKE) $(TOOLBINDIR)/gencfu -c -i $(DATABUILDDIR) -r $(word 1,$(ALL_CFU_SOURCE)) -w $(word 2,$(ALL_CFU_SOURCE)) -o $@
 397
 398
 399  ####################################################    CNV
 400  # CNV FILES
 401  $(CNV_FILES_SPECIAL) : $(UCM_FILES_SPECIAL) $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
 402 -       $(INVOKE) $(TOOLBINDIR)/makeconv --ignore-siso-check -c -d $(BUILDDIR) $(UCMSRCDIR)/$(@F:%.cnv=%.ucm)
 403 -$(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
 404 -       $(INVOKE) $(TOOLBINDIR)/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
 405 +       $(INVOKE) $(TOOLBINDIR)/makeconv --ignore-siso-check -c -d $(DATABUILDDIR) $(UCMSRCDIR)/$(@F:%.cnv=%.ucm)
 406 +$(DATABUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
 407 +       $(INVOKE) $(TOOLBINDIR)/makeconv -c -d $(DATABUILDDIR) $(UCMSRCDIR)/$(<F)
 408
 409  ####################################################    RES
 410  # RES FILES
 411
 412  ### curr res
 413  $(CURRBLDDIR)/%.res: $(CURRSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 414 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(CURRSRCDIR) -d $(CURRBLDDIR) $(<F)
 415 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(CURRSRCDIR) -d $(CURRBLDDIR) $(<F)
 416
 417  # copy the curr/pool.res file from the source folder to the build output folder
 418  # and swap it to native endianness
 419 @@ -603,7 +603,7 @@
 420         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(CURRSRCDIR)/pool.res $(CURRBLDDIR)/pool.res
 421
 422  $(CURRBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(CURR_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 423 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(CURR_TREE) -d $(CURRBLDDIR) $(INDEX_NAME).txt
 424 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(CURR_TREE) -d $(CURRBLDDIR) $(INDEX_NAME).txt
 425
 426  $(CURR_INDEX_FILE): $(SRCLISTDEPS)
 427         @echo "generating $@ (list of installed currency name locales)"; \
 428 @@ -619,7 +619,7 @@
 429
 430  ### lang res
 431  $(LANGBLDDIR)/%.res: $(LANGSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 432 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(LANGSRCDIR) -d $(LANGBLDDIR) $(<F)
 433 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LANGSRCDIR) -d $(LANGBLDDIR) $(<F)
 434
 435  # copy the lang/pool.res file from the source folder to the build output folder
 436  # and swap it to native endianness
 437 @@ -627,7 +627,7 @@
 438         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LANGSRCDIR)/pool.res $(LANGBLDDIR)/pool.res
 439
 440  $(LANGBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(LANG_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 441 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(LANG_TREE) -d $(LANGBLDDIR) $(INDEX_NAME).txt
 442 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $DATABUILDDIR -s $(OUTTMPDIR)/$(LANG_TREE) -d $(LANGBLDDIR) $(INDEX_NAME).txt
 443
 444  $(LANG_INDEX_FILE): $(SRCLISTDEPS)
 445         @echo "generating $@ (list of installed language name locales)"; \
 446 @@ -643,7 +643,7 @@
 447
 448  ### region res
 449  $(REGIONBLDDIR)/%.res: $(REGIONSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 450 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(REGIONSRCDIR) -d $(REGIONBLDDIR) $(<F)
 451 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(REGIONSRCDIR) -d $(REGIONBLDDIR) $(<F)
 452
 453  # copy the region/pool.res file from the source folder to the build output folder
 454  # and swap it to native endianness
 455 @@ -651,7 +651,7 @@
 456         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(REGIONSRCDIR)/pool.res $(REGIONBLDDIR)/pool.res
 457
 458  $(REGIONBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(REGION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 459 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(REGION_TREE) -d $(REGIONBLDDIR) $(INDEX_NAME).txt
 460 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(REGION_TREE) -d $(REGIONBLDDIR) $(INDEX_NAME).txt
 461
 462  $(REGION_INDEX_FILE): $(SRCLISTDEPS)
 463         @echo "generating $@ (list of installed region name locales)"; \
 464 @@ -667,7 +667,7 @@
 465
 466  ### zone res
 467  $(ZONEBLDDIR)/%.res: $(ZONESRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 468 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(ZONESRCDIR) -d $(ZONEBLDDIR) $(<F)
 469 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(ZONESRCDIR) -d $(ZONEBLDDIR) $(<F)
 470
 471  # copy the zone/pool.res file from the source folder to the build output folder
 472  # and swap it to native endianness
 473 @@ -675,7 +675,7 @@
 474         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ZONESRCDIR)/pool.res $(ZONEBLDDIR)/pool.res
 475
 476  $(ZONEBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(ZONE_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 477 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(ZONE_TREE) -d $(ZONEBLDDIR) $(INDEX_NAME).txt
 478 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(ZONE_TREE) -d $(ZONEBLDDIR) $(INDEX_NAME).txt
 479
 480  $(ZONE_INDEX_FILE): $(SRCLISTDEPS)
 481         @echo "generating $@ (list of installed time zone name locales)"; \
 482 @@ -691,7 +691,7 @@
 483
 484  ### unit res
 485  $(UNITBLDDIR)/%.res: $(UNITSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 486 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(UNITSRCDIR) -d $(UNITBLDDIR) $(<F)
 487 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(UNITSRCDIR) -d $(UNITBLDDIR) $(<F)
 488
 489  # copy the unit/pool.res file from the source folder to the build output folder
 490  # and swap it to native endianness
 491 @@ -699,7 +699,7 @@
 492         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(UNITSRCDIR)/pool.res $(UNITBLDDIR)/pool.res
 493
 494  $(UNITBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(UNIT_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 495 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(UNIT_TREE) -d $(UNITBLDDIR) $(INDEX_NAME).txt
 496 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(UNIT_TREE) -d $(UNITBLDDIR) $(INDEX_NAME).txt
 497
 498  $(UNIT_INDEX_FILE): $(SRCLISTDEPS)
 499         @echo "generating $@ (list of installed time zone name locales)"; \
 500 @@ -715,10 +715,10 @@
 501
 502  ### collation res
 503  $(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 504 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
 505 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
 506
 507  $(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 508 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
 509 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
 510
 511  $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
 512         @echo "generating $@ (list of installed collation locales)"; \
 513 @@ -734,10 +734,10 @@
 514
 515  ### brk res
 516  $(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DICT_FILES) $(DAT_FILES)
 517 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
 518 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
 519
 520  $(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 521 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
 522 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
 523
 524  $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
 525         @echo "generating $@ (list of installed break locales)"; \
 526 @@ -753,10 +753,10 @@
 527
 528  ### RBNF res
 529  $(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 530 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
 531 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
 532
 533  $(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 534 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
 535 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
 536
 537  $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
 538         @echo "generating $@ (list of installed RBNF locales)"; \
 539 @@ -772,18 +772,18 @@
 540
 541  ### TRANSLIT res
 542  $(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 543 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
 544 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
 545
 546  ### normal (locale) res
 547  all-RES:  $(RES_FILES)
 548
 549 -$(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 550 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
 551 +$(DATABUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 552 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LOCSRCDIR) -d $(DATABUILDDIR) $(<F)
 553
 554  # copy the locales/pool.res file from the source folder to the build output folder
 555  # and swap it to native endianness
 556 -$(BUILDDIR)/pool.res: $(LOCSRCDIR)/pool.res
 557 -       $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LOCSRCDIR)/pool.res $(BUILDDIR)/pool.res
 558 +$(DATABUILDDIR)/pool.res: $(LOCSRCDIR)/pool.res
 559 +       $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LOCSRCDIR)/pool.res $(DATABUILDDIR)/pool.res
 560
 561  # if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo
 562  ifeq ($(TZDATA),)
 563 @@ -797,9 +797,9 @@
 564
 565  # Override the normal genrb for zoneinfo to always pull from
 566  # icu/source/tools/tzcode/zoneinfo64.txt
 567 -$(BUILDDIR)/zoneinfo64.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 568 +$(DATABUILDDIR)/zoneinfo64.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 569         @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
 570 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
 571 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(ZONEINFO)
 572
 573  # Create the tzcode tool and zoneinfo as needed.
 574  $(ZONEINFO): $(TZDATA)
 575 @@ -810,8 +810,8 @@
 576  endif
 577
 578  # zoneinfo has some issues. Ignore some warnings with -q
 579 -$(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 580 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
 581 +$(DATABUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 582 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -s $(MISCSRCDIR) -d $(DATABUILDDIR) $(<F)
 583
 584
 585
 586 @@ -829,17 +829,17 @@
 587         echo "}" >> $@;
 588
 589  clean-resindex:
 590 -       -$(RMV) $(BUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
 591 +       -$(RMV) $(DATABUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
 592
 593 -$(BUILDDIR)/$(INDEX_NAME).res: $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 594 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
 595 +$(DATABUILDDIR)/$(INDEX_NAME).res: $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 596 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(INDEX_FILE)
 597
 598  # The core Unicode properties files (pnames.icu, uprops.icu, ucase.icu, ubidi.icu)
 599  # are hardcoded in the common DLL and therefore not included in the data package any more.
 600  # They are not built by default but need to be built for ICU4J data and for getting the .c source files
 601  # when updating the Unicode data.
 602  uni-core-data: build-dir $(UNI_CORE_TARGET_DATA)
 603 -       @echo Unicode .icu files built to $(BUILDDIR)
 604 +       @echo Unicode .icu files built to $(DATABUILDDIR)
 605         echo timestamp > $@
 606
 607  # Build the ICU4J icudata.jar.
 608 @@ -862,7 +862,7 @@
 609         mkdir -p $(OUTDIR)/icu4j/$(ICU4J_DATA_DIRNAME)
 610         mkdir -p $(OUTDIR)/icu4j/tzdata/$(ICU4J_DATA_DIRNAME)
 611         echo $(UNI_CORE_DATA) > $(OUTDIR)/icu4j/add.txt
 612 -       $(INVOKE) $(TOOLBINDIR)/icupkg $(OUTTMPDIR)/$(ICUDATA_PLATFORM_NAME).dat $(OUTDIR)/icu4j/$(ICUDATA_BASENAME_VERSION)b.dat -a $(OUTDIR)/icu4j/add.txt -s $(BUILDDIR) -x '*' -tb -d $(OUTDIR)/icu4j/$(ICU4J_DATA_DIRNAME)
 613 +       $(INVOKE) $(TOOLBINDIR)/icupkg $(OUTTMPDIR)/$(ICUDATA_PLATFORM_NAME).dat $(OUTDIR)/icu4j/$(ICUDATA_BASENAME_VERSION)b.dat -a $(OUTDIR)/icu4j/add.txt -s $(DATABUILDDIR) -x '*' -tb -d $(OUTDIR)/icu4j/$(ICU4J_DATA_DIRNAME)
 614         mv $(ICU4J_TZDATA_PATHS:%=$(OUTDIR)/icu4j/%) "$(OUTDIR)/icu4j/tzdata/$(ICU4J_DATA_DIRNAME)"
 615
 616  $(OUTDIR)/icu4j/icutzdata.jar: generate-data
 617 diff -ruN icu/source/extra/uconv/Makefile.in icu.aros/source/extra/uconv/Makefile.in
 618 --- icu/source/extra/uconv/Makefile.in  2017-03-14 22:01:56.000000000 +0100
 619 +++ icu.aros/source/extra/uconv/Makefile.in     2018-03-20 22:50:34.861198157 +0100
 620 @@ -156,7 +156,7 @@
 621  $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
 622         $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
 623
 624 -$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
 625 +$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk $(RESFILES)
 626         @-$(RMV) $@
 627         @for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \
 628           echo $$file >> $@; \
 629 diff -ruN icu/source/i18n/Makefile.in icu.aros/source/i18n/Makefile.in
 630 --- icu/source/i18n/Makefile.in 2017-10-11 18:24:34.000000000 +0200
 631 +++ icu.aros/source/i18n/Makefile.in    2018-03-20 22:54:57.709435061 +0100
 632 @@ -29,7 +29,7 @@
 633  TARGET_STUBNAME=$(I18N_STUBNAME)
 634
 635  ifneq ($(ENABLE_STATIC),)
 636 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 637 +I18NTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 638  endif
 639
 640  ifneq ($(ENABLE_SHARED),)
 641 @@ -47,7 +47,7 @@
 642
 643  endif   # ENABLE_SHARED
 644
 645 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 646 +ALL_TARGETS = $(I18NTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 647
 648  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 649  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 650 @@ -144,7 +144,7 @@
 651  install-library: all-local
 652         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 653  ifneq ($(ENABLE_STATIC),)
 654 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 655 +       $(INSTALL-L) $(I18NTARGET) $(DESTDIR)$(libdir)
 656  endif
 657  ifneq ($(ENABLE_SHARED),)
 658         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 659 @@ -188,7 +188,7 @@
 660          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 661
 662  ifneq ($(ENABLE_STATIC),)
 663 -$(TARGET): $(STATIC_OBJECTS)
 664 +$(I18NTARGET): $(STATIC_OBJECTS)
 665         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 666         $(RANLIB) $@
 667  endif
 668 diff -ruN icu/source/io/Makefile.in icu.aros/source/io/Makefile.in
 669 --- icu/source/io/Makefile.in   2017-03-14 22:01:57.000000000 +0100
 670 +++ icu.aros/source/io/Makefile.in      2018-03-20 22:57:33.711963246 +0100
 671 @@ -29,7 +29,7 @@
 672  TARGET_STUBNAME=$(IO_STUBNAME)
 673
 674  ifneq ($(ENABLE_STATIC),)
 675 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 676 +IOTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 677  endif
 678
 679  ifneq ($(ENABLE_SHARED),)
 680 @@ -47,7 +47,7 @@
 681
 682  endif   # ENABLE_SHARED
 683
 684 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 685 +ALL_TARGETS = $(IOTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 686
 687  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 688  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 689 @@ -98,7 +98,7 @@
 690  install-library: all-local
 691         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 692  ifneq ($(ENABLE_STATIC),)
 693 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 694 +       $(INSTALL-L) $(IOTARGET) $(DESTDIR)$(libdir)
 695  endif
 696  ifneq ($(ENABLE_SHARED),)
 697         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 698 @@ -142,7 +142,7 @@
 699          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 700
 701  ifneq ($(ENABLE_STATIC),)
 702 -$(TARGET): $(STATIC_OBJECTS)
 703 +$(IOTARGET): $(STATIC_OBJECTS)
 704         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 705         $(RANLIB) $@
 706  endif
 707 diff -ruN icu/source/layoutex/Makefile.in icu.aros/source/layoutex/Makefile.in
 708 --- icu/source/layoutex/Makefile.in     2016-12-07 02:45:12.000000000 +0100
 709 +++ icu.aros/source/layoutex/Makefile.in        2018-03-20 23:01:23.203694393 +0100
 710 @@ -28,7 +28,7 @@
 711  TARGET_STUBNAME=$(LAYOUTEX_STUBNAME)
 712
 713  ifneq ($(ENABLE_STATIC),)
 714 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 715 +LAYEXTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 716  endif
 717
 718  ifneq ($(ENABLE_SHARED),)
 719 @@ -46,7 +46,7 @@
 720
 721  endif   # ENABLE_SHARED
 722
 723 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 724 +ALL_TARGETS = $(LAYEXTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 725
 726  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 727  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 728 @@ -111,7 +111,7 @@
 729  install-library: all-local
 730         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 731  ifneq ($(ENABLE_STATIC),)
 732 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 733 +       $(INSTALL-L) $(LAYEXTARGET) $(DESTDIR)$(libdir)
 734  endif
 735  ifneq ($(ENABLE_SHARED),)
 736         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 737 @@ -155,7 +155,7 @@
 738          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 739
 740  ifneq ($(ENABLE_STATIC),)
 741 -$(TARGET): $(STATIC_OBJECTS)
 742 +$(LAYEXTARGET): $(STATIC_OBJECTS)
 743         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 744         $(RANLIB) $@
 745  endif
 746 diff -ruN icu/source/stubdata/Makefile.in icu.aros/source/stubdata/Makefile.in
 747 --- icu/source/stubdata/Makefile.in     2016-12-07 02:45:02.000000000 +0100
 748 +++ icu.aros/source/stubdata/Makefile.in        2018-03-20 23:08:04.704164862 +0100
 749 @@ -29,7 +29,7 @@
 750  TARGET_STUBNAME=$(DATA_STUBNAME)
 751
 752  ifneq ($(ENABLE_STATIC),)
 753 -TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 754 +STUBTARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 755  endif
 756
 757
 758 @@ -39,7 +39,7 @@
 759  endif
 760
 761
 762 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
 763 +ALL_TARGETS = $(STUBTARGET) $(ALL_SO_TARGETS)
 764
 765  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 766  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 767 @@ -84,7 +84,7 @@
 768  install-library: all-local
 769         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 770  ifneq ($(ENABLE_STATIC),)
 771 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 772 +       $(INSTALL-L) $(STUBTARGET) $(DESTDIR)$(libdir)
 773  endif
 774  ifneq ($(ENABLE_SHARED),)
 775         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 776 @@ -121,7 +121,7 @@
 777         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 778
 779  ifneq ($(ENABLE_STATIC),)
 780 -$(TARGET): $(STATIC_OBJECTS)
 781 +$(STUBTARGET): $(STATIC_OBJECTS)
 782         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 783         $(RANLIB) $@
 784  endif
 785 diff -ruN icu/source/tools/ctestfw/Makefile.in icu.aros/source/tools/ctestfw/Makefile.in
 786 --- icu/source/tools/ctestfw/Makefile.in        2016-12-07 02:45:00.000000000 +0100
 787 +++ icu.aros/source/tools/ctestfw/Makefile.in   2018-03-20 23:16:26.564600824 +0100
 788 @@ -29,7 +29,7 @@
 789  TARGET_STUBNAME=$(CTESTFW_STUBNAME)
 790
 791  ifneq ($(ENABLE_STATIC),)
 792 -TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 793 +CTFWTARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 794  endif
 795
 796  ifneq ($(ENABLE_SHARED),)
 797 @@ -37,7 +37,7 @@
 798  ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
 799  endif
 800
 801 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
 802 +ALL_TARGETS = $(CTFWTARGET) $(ALL_SO_TARGETS)
 803
 804  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 805  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 806 @@ -80,7 +80,7 @@
 807  install-library: all-local
 808         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 809  ifneq ($(ENABLE_STATIC),)
 810 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 811 +       $(INSTALL-L) $(CTFWTARGET) $(DESTDIR)$(libdir)
 812  endif
 813  ifneq ($(ENABLE_SHARED),)
 814         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 815 @@ -117,7 +117,7 @@
 816          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 817
 818  ifneq ($(ENABLE_STATIC),)
 819 -$(TARGET): $(STATIC_OBJECTS)
 820 +$(CTFWTARGET): $(STATIC_OBJECTS)
 821         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 822         $(RANLIB) $@
 823  endif
 824 diff -ruN icu/source/tools/escapesrc/Makefile.in icu.aros/source/tools/escapesrc/Makefile.in
 825 --- icu/source/tools/escapesrc/Makefile.in      2017-03-23 00:26:34.000000000 +0100
 826 +++ icu.aros/source/tools/escapesrc/Makefile.in 2018-03-20 23:22:54.939495976 +0100
 827 @@ -29,7 +29,7 @@
 828  CLEANFILES = *~ $(DEPS) $(MAN_FILES) ./output-*.cpp
 829
 830  ## Target information
 831 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 832 +ESRCTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 833
 834  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 835  #LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC)
 836 @@ -54,11 +54,11 @@
 837  dist: dist-local
 838  check: all check-local
 839
 840 -all-local: $(TARGET) $(MAN_FILES)
 841 +all-local: $(ESRCTARGET) $(MAN_FILES)
 842
 843  install-local: all-local install-man
 844         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
 845 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
 846 +       $(INSTALL) $(ESRCTARGET) $(DESTDIR)$(sbindir)
 847
 848  install-man: $(MAN_FILES)
 849  #      $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 850 @@ -69,24 +69,24 @@
 851
 852  clean-local:
 853         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 854 -       $(RMV) $(TARGET) $(OBJECTS)
 855 +       $(RMV) $(ESRCTARGET) $(OBJECTS)
 856
 857  distclean-local: clean-local
 858         $(RMV) Makefile
 859
 860  check-local: all-local
 861         @echo Testing test-nochange.cpp
 862 -       @$(INVOKE) $(TARGET) $(srcdir)/test-nochange.cpp ./output-nochange.cpp
 863 +       @$(INVOKE) $(ESRCTARGET) $(srcdir)/test-nochange.cpp ./output-nochange.cpp
 864         @-diff -I '#line.*' $(srcdir)/test-nochange.cpp ./output-nochange.cpp || (echo >&2 'warning: diff failed or not found' ; true)
 865         @echo Testing test-simple.cpp
 866 -       @$(INVOKE) $(TARGET) $(srcdir)/test-simple.cpp ./output-simple.cpp
 867 +       @$(INVOKE) $(ESRCTARGET) $(srcdir)/test-simple.cpp ./output-simple.cpp
 868         @-diff -I '#line.*' $(srcdir)/expect-simple.cpp ./output-simple.cpp   || (echo >&2 'warning: diff failed or not found' ; true)
 869
 870  Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 871         cd $(top_builddir) \
 872          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 873
 874 -$(TARGET) : $(OBJECTS)
 875 +$(ESRCTARGET) : $(OBJECTS)
 876         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 877         $(POST_BUILD_STEP)
 878
 879 diff -ruN icu/source/tools/genbrk/Makefile.in icu.aros/source/tools/genbrk/Makefile.in
 880 --- icu/source/tools/genbrk/Makefile.in 2016-12-07 02:45:01.000000000 +0100
 881 +++ icu.aros/source/tools/genbrk/Makefile.in    2018-03-20 23:24:33.636410681 +0100
 882 @@ -26,7 +26,7 @@
 883  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 884
 885  ## Target information
 886 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 887 +GBRKTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 888
 889  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 890  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 891 @@ -50,11 +50,11 @@
 892  dist: dist-local
 893  check: all check-local
 894
 895 -all-local: $(TARGET) $(MAN_FILES)
 896 +all-local: $(GBRKTARGET) $(MAN_FILES)
 897
 898  install-local: all-local install-man
 899         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 900 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
 901 +       $(INSTALL) $(GBRKTARGET) $(DESTDIR)$(bindir)
 902
 903  install-man: $(MAN_FILES)
 904         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 905 @@ -64,7 +64,7 @@
 906
 907  clean-local:
 908         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 909 -       $(RMV) $(TARGET) $(OBJECTS)
 910 +       $(RMV) $(GBRKTARGET) $(OBJECTS)
 911
 912  distclean-local: clean-local
 913         $(RMV) Makefile
 914 @@ -75,7 +75,7 @@
 915         cd $(top_builddir) \
 916          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 917
 918 -$(TARGET) : $(OBJECTS)
 919 +$(GBRKTARGET) : $(OBJECTS)
 920         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 921         $(POST_BUILD_STEP)
 922
 923 diff -ruN icu/source/tools/genccode/Makefile.in icu.aros/source/tools/genccode/Makefile.in
 924 --- icu/source/tools/genccode/Makefile.in       2016-12-07 02:45:01.000000000 +0100
 925 +++ icu.aros/source/tools/genccode/Makefile.in  2018-03-20 23:25:49.149143818 +0100
 926 @@ -27,7 +27,7 @@
 927  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 928
 929  ## Target information
 930 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 931 +GCODETARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 932
 933  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 934  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 935 @@ -51,11 +51,11 @@
 936  dist: dist-local
 937  check: all check-local
 938
 939 -all-local: $(TARGET) $(MAN_FILES)
 940 +all-local: $(GCODETARGET) $(MAN_FILES)
 941
 942  install-local: all-local install-man
 943         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
 944 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
 945 +       $(INSTALL) $(GCODETARGET) $(DESTDIR)$(sbindir)
 946
 947  install-man: $(MAN_FILES)
 948         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 949 @@ -65,7 +65,7 @@
 950
 951  clean-local:
 952         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 953 -       $(RMV) $(TARGET) $(OBJECTS)
 954 +       $(RMV) $(GCODETARGET) $(OBJECTS)
 955
 956  distclean-local: clean-local
 957         $(RMV) Makefile
 958 @@ -76,7 +76,7 @@
 959         cd $(top_builddir) \
 960          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 961
 962 -$(TARGET) : $(OBJECTS)
 963 +$(GCODETARGET) : $(OBJECTS)
 964         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 965         $(POST_BUILD_STEP)
 966
 967 diff -ruN icu/source/tools/gencfu/Makefile.in icu.aros/source/tools/gencfu/Makefile.in
 968 --- icu/source/tools/gencfu/Makefile.in 2016-12-07 02:45:01.000000000 +0100
 969 +++ icu.aros/source/tools/gencfu/Makefile.in    2018-03-20 23:27:40.890272654 +0100
 970 @@ -26,7 +26,7 @@
 971  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 972
 973  ## Target information
 974 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 975 +GCFUTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 976
 977  CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 978  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 979 @@ -50,11 +50,11 @@
 980  dist: dist-local
 981  check: all check-local
 982
 983 -all-local: $(TARGET) $(MAN_FILES)
 984 +all-local: $(GCFUTARGET) $(MAN_FILES)
 985
 986  install-local: all-local install-man
 987         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 988 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
 989 +       $(INSTALL) $(GCFUTARGET) $(DESTDIR)$(bindir)
 990
 991  install-man: $(MAN_FILES)
 992         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 993 @@ -64,7 +64,7 @@
 994
 995  clean-local:
 996         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 997 -       $(RMV) $(TARGET) $(OBJECTS)
 998 +       $(RMV) $(GCFUTARGET) $(OBJECTS)
 999
1000  distclean-local: clean-local
1001         $(RMV) Makefile
1002 @@ -75,7 +75,7 @@
1003         cd $(top_builddir) \
1004          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1005
1006 -$(TARGET) : $(OBJECTS)
1007 +$(GCFUTARGET) : $(OBJECTS)
1008         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1009         $(POST_BUILD_STEP)
1010
1011 diff -ruN icu/source/tools/gencmn/Makefile.in icu.aros/source/tools/gencmn/Makefile.in
1012 --- icu/source/tools/gencmn/Makefile.in 2016-12-07 02:45:01.000000000 +0100
1013 +++ icu.aros/source/tools/gencmn/Makefile.in    2018-03-20 23:28:43.798927781 +0100
1014 @@ -27,7 +27,7 @@
1015  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1016
1017  ## Target information
1018 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1019 +GCMNTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1020
1021  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1022  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1023 @@ -51,11 +51,11 @@
1024  dist: dist-local
1025  check: all check-local
1026
1027 -all-local: $(TARGET) $(MAN_FILES)
1028 +all-local: $(GCMNTARGET) $(MAN_FILES)
1029
1030  install-local: all-local install-man
1031         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1032 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1033 +       $(INSTALL) $(GCMNTARGET) $(DESTDIR)$(sbindir)
1034
1035  install-man: $(MAN_FILES)
1036         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1037 @@ -65,7 +65,7 @@
1038
1039  clean-local:
1040         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1041 -       $(RMV) $(TARGET) $(OBJECTS)
1042 +       $(RMV) $(GCMNTARGET) $(OBJECTS)
1043
1044  distclean-local: clean-local
1045         $(RMV) Makefile
1046 @@ -76,7 +76,7 @@
1047         cd $(top_builddir) \
1048          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1049
1050 -$(TARGET) : $(OBJECTS)
1051 +$(GCMNTARGET) : $(OBJECTS)
1052         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1053         $(POST_BUILD_STEP)
1054
1055 diff -ruN icu/source/tools/gencnval/Makefile.in icu.aros/source/tools/gencnval/Makefile.in
1056 --- icu/source/tools/gencnval/Makefile.in       2016-12-07 02:45:00.000000000 +0100
1057 +++ icu.aros/source/tools/gencnval/Makefile.in  2018-03-20 23:29:34.887468772 +0100
1058 @@ -27,7 +27,7 @@
1059  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1060
1061  ## Target information
1062 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1063 +GCNVALTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1064
1065  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1066  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1067 @@ -51,11 +51,11 @@
1068  dist: dist-local
1069  check: all check-local
1070
1071 -all-local: $(TARGET) $(MAN_FILES)
1072 +all-local: $(GCNVALTARGET) $(MAN_FILES)
1073
1074  install-local: all-local install-man
1075         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1076 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1077 +       $(INSTALL) $(GCNVALTARGET) $(DESTDIR)$(bindir)
1078
1079  install-man: $(MAN_FILES)
1080         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1081 @@ -65,7 +65,7 @@
1082
1083  clean-local:
1084         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1085 -       $(RMV) $(TARGET) $(OBJECTS)
1086 +       $(RMV) $(GCNVALTARGET) $(OBJECTS)
1087
1088  distclean-local: clean-local
1089         $(RMV) Makefile
1090 @@ -76,7 +76,7 @@
1091         cd $(top_builddir) \
1092          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1093
1094 -$(TARGET) : $(OBJECTS)
1095 +$(GCNVALTARGET) : $(OBJECTS)
1096         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1097         $(POST_BUILD_STEP)
1098
1099 diff -ruN icu/source/tools/gendict/Makefile.in icu.aros/source/tools/gendict/Makefile.in
1100 --- icu/source/tools/gendict/Makefile.in        2016-12-07 02:45:01.000000000 +0100
1101 +++ icu.aros/source/tools/gendict/Makefile.in   2018-03-20 23:34:59.231045798 +0100
1102 @@ -26,7 +26,7 @@
1103  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1104
1105  ## Target information
1106 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1107 +GDCTTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1108
1109  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1110  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1111 @@ -50,11 +50,11 @@
1112  dist: dist-local
1113  check: all check-local
1114
1115 -all-local: $(TARGET) $(MAN_FILES)
1116 +all-local: $(GDCTTARGET) $(MAN_FILES)
1117
1118  install-local: all-local install-man
1119         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1120 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1121 +       $(INSTALL) $(GDCTTARGET) $(DESTDIR)$(bindir)
1122
1123  install-man: $(MAN_FILES)
1124         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1125 @@ -64,7 +64,7 @@
1126
1127  clean-local:
1128         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1129 -       $(RMV) $(TARGET) $(OBJECTS)
1130 +       $(RMV) $(GDCTTARGET) $(OBJECTS)
1131
1132  distclean-local: clean-local
1133         $(RMV) Makefile
1134 @@ -75,7 +75,7 @@
1135         cd $(top_builddir) \
1136          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1137
1138 -$(TARGET) : $(OBJECTS)
1139 +$(GDCTTARGET) : $(OBJECTS)
1140         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1141         $(POST_BUILD_STEP)
1142
1143 diff -ruN icu/source/tools/gennorm2/Makefile.in icu.aros/source/tools/gennorm2/Makefile.in
1144 --- icu/source/tools/gennorm2/Makefile.in       2017-10-11 18:24:35.000000000 +0200
1145 +++ icu.aros/source/tools/gennorm2/Makefile.in  2018-03-20 23:36:52.209562122 +0100
1146 @@ -22,7 +22,7 @@
1147  CLEANFILES = *~ $(DEPS)
1148
1149  ## Target information
1150 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1151 +GNR2TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1152
1153  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1154  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1155 @@ -46,17 +46,17 @@
1156  dist: dist-local
1157  check: all check-local
1158
1159 -all-local: $(TARGET)
1160 +all-local: $(GNR2TARGET)
1161
1162  install-local: all-local
1163         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1164 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1165 +       $(INSTALL) $(GNR2TARGET) $(DESTDIR)$(sbindir)
1166
1167  dist-local:
1168
1169  clean-local:
1170         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1171 -       $(RMV) $(TARGET) $(OBJECTS)
1172 +       $(RMV) $(GNR2TARGET) $(OBJECTS)
1173
1174  distclean-local: clean-local
1175         $(RMV) Makefile
1176 @@ -67,7 +67,7 @@
1177         cd $(top_builddir) \
1178          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1179
1180 -$(TARGET) : $(OBJECTS)
1181 +$(GNR2TARGET) : $(OBJECTS)
1182         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1183         $(POST_BUILD_STEP)
1184
1185 diff -ruN icu/source/tools/genrb/Makefile.in icu.aros/source/tools/genrb/Makefile.in
1186 --- icu/source/tools/genrb/Makefile.in  2017-03-14 22:01:57.000000000 +0100
1187 +++ icu.aros/source/tools/genrb/Makefile.in     2018-03-20 23:40:25.241280979 +0100
1188 @@ -29,7 +29,7 @@
1189  CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS)
1190
1191  ## Target information
1192 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1193 +GRBTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1194  # derb depends on icuio
1195  @ICUIO_TRUE@DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
1196
1197 @@ -61,11 +61,11 @@
1198  dist: dist-local
1199  check: all check-local
1200
1201 -all-local: $(TARGET) $(DERB) $(MAN_FILES)
1202 +all-local: $(GRBTARGET) $(DERB) $(MAN_FILES)
1203
1204  install-local: all-local install-man
1205         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1206 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1207 +       $(INSTALL) $(GRBTARGET) $(DESTDIR)$(bindir)
1208  @ICUIO_TRUE@   $(INSTALL) $(DERB) $(DESTDIR)$(bindir)
1209
1210  install-man: $(MAN_FILES)
1211 @@ -76,7 +76,7 @@
1212
1213  clean-local:
1214         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1215 -       $(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ)
1216 +       $(RMV) $(GRBTARGET) $(DERB) $(OBJECTS) $(DERB_OBJ)
1217
1218  distclean-local: clean-local
1219         $(RMV) Makefile
1220 @@ -87,7 +87,7 @@
1221         cd $(top_builddir) \
1222          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1223
1224 -$(TARGET) : $(OBJECTS)
1225 +$(GRBTARGET) : $(OBJECTS)
1226         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1227         $(POST_BUILD_STEP)
1228
1229 diff -ruN icu/source/tools/gensprep/Makefile.in icu.aros/source/tools/gensprep/Makefile.in
1230 --- icu/source/tools/gensprep/Makefile.in       2016-12-07 02:45:00.000000000 +0100
1231 +++ icu.aros/source/tools/gensprep/Makefile.in  2018-03-20 23:41:55.937392930 +0100
1232 @@ -27,7 +27,7 @@
1233  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1234
1235  ## Target information
1236 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1237 +GSPREPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1238
1239  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1240  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1241 @@ -51,11 +51,11 @@
1242  dist: dist-local
1243  check: all check-local
1244
1245 -all-local: $(TARGET) $(MAN_FILES)
1246 +all-local: $(GSPREPTARGET) $(MAN_FILES)
1247
1248  install-local: all-local install-man
1249         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1250 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1251 +       $(INSTALL) $(GSPREPTARGET) $(DESTDIR)$(sbindir)
1252
1253  install-man: $(MAN_FILES)
1254         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1255 @@ -65,7 +65,7 @@
1256
1257  clean-local:
1258         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1259 -       $(RMV) $(TARGET) $(OBJECTS)
1260 +       $(RMV) $(GSPREPTARGET) $(OBJECTS)
1261
1262  distclean-local: clean-local
1263         $(RMV) Makefile
1264 @@ -76,7 +76,7 @@
1265         cd $(top_builddir) \
1266          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1267
1268 -$(TARGET) : $(OBJECTS)
1269 +$(GSPREPTARGET) : $(OBJECTS)
1270         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1271         $(POST_BUILD_STEP)
1272
1273 diff -ruN icu/source/tools/gentest/Makefile.in icu.aros/source/tools/gentest/Makefile.in
1274 --- icu/source/tools/gentest/Makefile.in        2016-12-07 02:45:01.000000000 +0100
1275 +++ icu.aros/source/tools/gentest/Makefile.in   2018-03-20 23:42:38.743189381 +0100
1276 @@ -20,7 +20,7 @@
1277  CLEANFILES = *~ $(DEPS)
1278
1279  ## Target information
1280 -TARGET = gentest$(EXEEXT)
1281 +GTESTTARGET = gentest$(EXEEXT)
1282
1283  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw
1284  CPPFLAGS+= -I$(top_srcdir)/i18n
1285 @@ -45,7 +45,7 @@
1286  dist: dist-local
1287  check: all check-local
1288
1289 -all-local: $(TARGET)
1290 +all-local: $(GTESTTARGET)
1291
1292  install-local: all-local
1293
1294 @@ -53,7 +53,7 @@
1295
1296  clean-local:
1297         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1298 -       $(RMV) $(TARGET) $(OBJECTS)
1299 +       $(RMV) $(GTESTTARGET) $(OBJECTS)
1300
1301  distclean-local: clean-local
1302         $(RMV) Makefile
1303 @@ -64,7 +64,7 @@
1304         cd $(top_builddir) \
1305          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1306
1307 -$(TARGET) : $(OBJECTS)
1308 +$(GTESTTARGET) : $(OBJECTS)
1309         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1310         $(POST_BUILD_STEP)
1311
1312 diff -ruN icu/source/tools/icuinfo/Makefile.in icu.aros/source/tools/icuinfo/Makefile.in
1313 --- icu/source/tools/icuinfo/Makefile.in        2016-12-07 02:45:00.000000000 +0100
1314 +++ icu.aros/source/tools/icuinfo/Makefile.in   2018-03-20 23:45:10.976954917 +0100
1315 @@ -20,7 +20,7 @@
1316  CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
1317
1318  ## Target information
1319 -TARGET = icuinfo$(EXEEXT)
1320 +IINFTARGET = icuinfo$(EXEEXT)
1321
1322  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw
1323  CPPFLAGS+= -I$(top_srcdir)/i18n
1324 @@ -50,30 +50,30 @@
1325  dist: dist-local
1326  check: all check-local
1327
1328 -all-local: $(TARGET)
1329 +all-local: $(IINFTARGET)
1330
1331  install-local: all-local
1332         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1333 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1334 +       $(INSTALL) $(IINFTARGET) $(DESTDIR)$(bindir)
1335
1336  dist-local:
1337
1338  clean-local:
1339         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1340 -       $(RMV) $(TARGET) $(OBJECTS)
1341 +       $(RMV) $(IINFTARGET) $(OBJECTS)
1342
1343  distclean-local: clean-local
1344         $(RMV) Makefile
1345
1346 -check-local: $(TARGET)
1347 -       $(INVOKE) ./$(TARGET) $(ICUINFO_OPTS)
1348 +check-local: $(IINFTARGET)
1349 +       $(INVOKE) ./$(IINFTARGET) $(ICUINFO_OPTS)
1350
1351  Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
1352         cd $(top_builddir) \
1353          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1354  -include Makefile.local
1355
1356 -$(TARGET) : $(OBJECTS)
1357 +$(IINFTARGET) : $(OBJECTS)
1358         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1359         $(POST_BUILD_STEP)
1360
1361 @@ -99,7 +99,7 @@
1362  plugin: $(PLUGIN)
1363
1364  plugin-check: $(PLUGIN) $(PLUGINFILE)
1365 -       $(INVOKE) ICU_PLUGINS="$(CURR_FULL_DIR)" ./$(TARGET) -v -L
1366 +       $(INVOKE) ICU_PLUGINS="$(CURR_FULL_DIR)" ./$(IINFTARGET) -v -L
1367  else
1368  plugin plugin-check $(PLUGIN):
1369         @echo "Plugins are disabled (use --enable-plugins to enable)"
1370 diff -ruN icu/source/tools/icupkg/Makefile.in icu.aros/source/tools/icupkg/Makefile.in
1371 --- icu/source/tools/icupkg/Makefile.in 2016-12-07 02:45:00.000000000 +0100
1372 +++ icu.aros/source/tools/icupkg/Makefile.in    2018-03-20 23:45:53.714423649 +0100
1373 @@ -26,7 +26,7 @@
1374  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1375
1376  ## Target information
1377 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1378 +ICUPKGTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1379
1380  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1381  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1382 @@ -50,11 +50,11 @@
1383  dist: dist-local
1384  check: all check-local
1385
1386 -all-local: $(TARGET) $(MAN_FILES)
1387 +all-local: $(ICUPKGTARGET) $(MAN_FILES)
1388
1389  install-local: all-local install-man
1390         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1391 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1392 +       $(INSTALL) $(ICUPKGTARGET) $(DESTDIR)$(sbindir)
1393
1394  install-man: $(MAN_FILES)
1395         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1396 @@ -65,7 +65,7 @@
1397
1398  clean-local:
1399         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1400 -       $(RMV) $(TARGET) $(OBJECTS)
1401 +       $(RMV) $(ICUPKGTARGET) $(OBJECTS)
1402
1403  distclean-local: clean-local
1404         $(RMV) Makefile
1405 @@ -76,7 +76,7 @@
1406         cd $(top_builddir) \
1407          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1408
1409 -$(TARGET) : $(OBJECTS)
1410 +$(ICUPKGTARGET) : $(OBJECTS)
1411         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1412         $(POST_BUILD_STEP)
1413
1414 diff -ruN icu/source/tools/icuswap/Makefile.in icu.aros/source/tools/icuswap/Makefile.in
1415 --- icu/source/tools/icuswap/Makefile.in        2016-12-07 02:45:01.000000000 +0100
1416 +++ icu.aros/source/tools/icuswap/Makefile.in   2018-03-20 23:46:29.691616387 +0100
1417 @@ -26,7 +26,7 @@
1418  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1419
1420  ## Target information
1421 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1422 +ICUSWPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1423
1424  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1425  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1426 @@ -50,11 +50,11 @@
1427  dist: dist-local
1428  check: all check-local
1429
1430 -all-local: $(TARGET) $(MAN_FILES)
1431 +all-local: $(ICUSWPTARGET) $(MAN_FILES)
1432
1433  install-local: all-local install-man
1434         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1435 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1436 +       $(INSTALL) $(ICUSWPTARGET) $(DESTDIR)$(sbindir)
1437
1438  install-man: $(MAN_FILES)
1439  #      $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1440 @@ -65,7 +65,7 @@
1441
1442  clean-local:
1443         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1444 -       $(RMV) $(TARGET) $(OBJECTS)
1445 +       $(RMV) $(ICUSWPTARGET) $(OBJECTS)
1446
1447  distclean-local: clean-local
1448         $(RMV) Makefile
1449 @@ -76,7 +76,7 @@
1450         cd $(top_builddir) \
1451          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1452
1453 -$(TARGET) : $(OBJECTS)
1454 +$(ICUSWPTARGET) : $(OBJECTS)
1455         echo Note: icuswap is obsolete - use icupkg instead.
1456         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1457         $(POST_BUILD_STEP)
1458 diff -ruN icu/source/tools/makeconv/Makefile.in icu.aros/source/tools/makeconv/Makefile.in
1459 --- icu/source/tools/makeconv/Makefile.in       2017-03-14 22:01:57.000000000 +0100
1460 +++ icu.aros/source/tools/makeconv/Makefile.in  2018-03-20 23:47:17.229135965 +0100
1461 @@ -26,7 +26,7 @@
1462  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1463
1464  ## Target information
1465 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1466 +MAKECONVTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1467
1468  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1469  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1470 @@ -50,11 +50,11 @@
1471  dist: dist-local
1472  check: all check-local
1473
1474 -all-local: $(TARGET) $(MAN_FILES)
1475 +all-local: $(MAKECONVTARGET) $(MAN_FILES)
1476
1477  install-local: all-local install-man
1478         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1479 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1480 +       $(INSTALL) $(MAKECONVTARGET) $(DESTDIR)$(bindir)
1481
1482  install-man: $(MAN_FILES)
1483         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1484 @@ -65,7 +65,7 @@
1485
1486  clean-local:
1487         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1488 -       $(RMV) $(TARGET) $(OBJECTS)
1489 +       $(RMV) $(MAKECONVTARGET) $(OBJECTS)
1490
1491  distclean-local: clean-local
1492         $(RMV) Makefile
1493 @@ -76,7 +76,7 @@
1494         cd $(top_builddir) \
1495          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1496
1497 -$(TARGET) : $(OBJECTS)
1498 +$(MAKECONVTARGET) : $(OBJECTS)
1499         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1500         $(POST_BUILD_STEP)
1501
1502 diff -ruN icu/source/tools/pkgdata/Makefile.in icu.aros/source/tools/pkgdata/Makefile.in
1503 --- icu/source/tools/pkgdata/Makefile.in        2017-03-14 22:01:57.000000000 +0100
1504 +++ icu.aros/source/tools/pkgdata/Makefile.in   2018-03-20 23:48:46.771842334 +0100
1505 @@ -30,7 +30,7 @@
1506  endif
1507
1508  ## Target information
1509 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1510 +PKGDATATARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1511
1512  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1513  DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
1514 @@ -55,11 +55,11 @@
1515  dist: dist-local
1516  check: all check-local
1517
1518 -all-local: $(TARGET) $(MAN_FILES)
1519 +all-local: $(PKGDATATARGET) $(MAN_FILES)
1520
1521  install-local: all-local install-man
1522         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1523 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1524 +       $(INSTALL) $(PKGDATATARGET) $(DESTDIR)$(bindir)
1525
1526  install-man: $(MAN_FILES)
1527         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1528 @@ -70,7 +70,7 @@
1529
1530  clean-local:
1531         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1532 -       $(RMV) $(TARGET) $(OBJECTS)
1533 +       $(RMV) $(PKGDATATARGET) $(OBJECTS)
1534
1535  distclean-local: clean-local
1536         $(RMV) Makefile
1537 @@ -81,7 +81,7 @@
1538         cd $(top_builddir) \
1539          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1540
1541 -$(TARGET) : $(OBJECTS)
1542 +$(PKGDATATARGET) : $(OBJECTS)
1543         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1544         $(POST_BUILD_STEP)
1545
1546 diff -ruN icu/source/tools/toolutil/Makefile.in icu.aros/source/tools/toolutil/Makefile.in
1547 --- icu/source/tools/toolutil/Makefile.in       2017-03-14 22:01:57.000000000 +0100
1548 +++ icu.aros/source/tools/toolutil/Makefile.in  2018-03-20 23:50:07.694135987 +0100
1549 @@ -29,7 +29,7 @@
1550  TARGET_STUBNAME=$(TOOLUTIL_STUBNAME)
1551
1552  ifneq ($(ENABLE_STATIC),)
1553 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1554 +TOOLUTILTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1555  endif
1556
1557  ifneq ($(ENABLE_SHARED),)
1558 @@ -37,7 +37,7 @@
1559  ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
1560  endif
1561
1562 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
1563 +ALL_TARGETS = $(TOOLUTILTARGET) $(ALL_SO_TARGETS)
1564
1565  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1566  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1567 @@ -91,7 +91,7 @@
1568  install-library: all-local
1569         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1570  ifneq ($(ENABLE_STATIC),)
1571 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1572 +       $(INSTALL-L) $(TOOLUTILTARGET) $(DESTDIR)$(libdir)
1573  endif
1574  ifneq ($(ENABLE_SHARED),)
1575         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1576 @@ -128,7 +128,7 @@
1577          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1578
1579  ifneq ($(ENABLE_STATIC),)
1580 -$(TARGET): $(STATIC_OBJECTS)
1581 +$(TOOLUTILTARGET): $(STATIC_OBJECTS)
1582         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1583         $(RANLIB) $@
1584  endif