tools/crosstools/icu4c-61_1-src-aros.diff

   1 diff -ruN icu/source/common/Makefile.in icu.aros/source/common/Makefile.in
   2 --- icu/source/common/Makefile.in       2018-03-26 15:38:30.000000000 +0200
   3 +++ icu.aros/source/common/Makefile.in  2018-04-15 23:39:39.976969085 +0200
   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        2018-03-26 15:38:30.000000000 +0200
  42 +++ icu.aros/source/common/putilimp.h   2018-04-15 23:44:29.869209004 +0200
  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        2018-03-26 15:38:29.000000000 +0200
  63 +++ icu.aros/source/common/unicode/umachine.h   2018-04-15 23:33:23.909159615 +0200
  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-04-15 13:06:23.000000000 +0200
  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        2018-03-26 15:38:44.000000000 +0200
 157 +++ icu.aros/source/configure   2018-04-16 02:22:08.137356243 +0200
 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 2018-03-26 15:38:38.000000000 +0200
 168 +++ icu.aros/source/data/Makefile.in    2018-04-16 01:30:44.829283736 +0200
 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,30 +580,30 @@
 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) | $(BUILDDIR)/cnvalias.icu
 414 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(CURRSRCDIR) -d $(CURRBLDDIR) $(<F)
 415 +$(CURRBLDDIR)/%.res: $(CURRSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 416 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(CURRSRCDIR) -d $(CURRBLDDIR) $(<F)
 417
 418  # copy the curr/pool.res file from the source folder to the build output folder
 419  # and swap it to native endianness
 420  $(CURRBLDDIR)/pool.res: $(CURRSRCDIR)/pool.res
 421         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(CURRSRCDIR)/pool.res $(CURRBLDDIR)/pool.res
 422
 423 -$(CURRBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(CURR_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 424 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(CURR_TREE) -d $(CURRBLDDIR) $(INDEX_NAME).txt
 425 +$(CURRBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(CURR_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 426 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(CURR_TREE) -d $(CURRBLDDIR) $(INDEX_NAME).txt
 427
 428  $(CURR_INDEX_FILE): $(SRCLISTDEPS)
 429         @echo "generating $@ (list of installed currency name locales)"; \
 430 @@ -618,16 +618,16 @@
 431         echo "}" >> $@;
 432
 433  ### lang res
 434 -$(LANGBLDDIR)/%.res: $(LANGSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 435 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(LANGSRCDIR) -d $(LANGBLDDIR) $(<F)
 436 +$(LANGBLDDIR)/%.res: $(LANGSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 437 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LANGSRCDIR) -d $(LANGBLDDIR) $(<F)
 438
 439  # copy the lang/pool.res file from the source folder to the build output folder
 440  # and swap it to native endianness
 441  $(LANGBLDDIR)/pool.res: $(LANGSRCDIR)/pool.res
 442         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LANGSRCDIR)/pool.res $(LANGBLDDIR)/pool.res
 443
 444 -$(LANGBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(LANG_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 445 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(LANG_TREE) -d $(LANGBLDDIR) $(INDEX_NAME).txt
 446 +$(LANGBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(LANG_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 447 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(LANG_TREE) -d $(LANGBLDDIR) $(INDEX_NAME).txt
 448
 449  $(LANG_INDEX_FILE): $(SRCLISTDEPS)
 450         @echo "generating $@ (list of installed language name locales)"; \
 451 @@ -642,16 +642,16 @@
 452         echo "}" >> $@;
 453
 454  ### region res
 455 -$(REGIONBLDDIR)/%.res: $(REGIONSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 456 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(REGIONSRCDIR) -d $(REGIONBLDDIR) $(<F)
 457 +$(REGIONBLDDIR)/%.res: $(REGIONSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 458 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(REGIONSRCDIR) -d $(REGIONBLDDIR) $(<F)
 459
 460  # copy the region/pool.res file from the source folder to the build output folder
 461  # and swap it to native endianness
 462  $(REGIONBLDDIR)/pool.res: $(REGIONSRCDIR)/pool.res
 463         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(REGIONSRCDIR)/pool.res $(REGIONBLDDIR)/pool.res
 464
 465 -$(REGIONBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(REGION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 466 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(REGION_TREE) -d $(REGIONBLDDIR) $(INDEX_NAME).txt
 467 +$(REGIONBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(REGION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 468 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(REGION_TREE) -d $(REGIONBLDDIR) $(INDEX_NAME).txt
 469
 470  $(REGION_INDEX_FILE): $(SRCLISTDEPS)
 471         @echo "generating $@ (list of installed region name locales)"; \
 472 @@ -666,16 +666,16 @@
 473         echo "}" >> $@;
 474
 475  ### zone res
 476 -$(ZONEBLDDIR)/%.res: $(ZONESRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 477 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(ZONESRCDIR) -d $(ZONEBLDDIR) $(<F)
 478 +$(ZONEBLDDIR)/%.res: $(ZONESRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 479 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(ZONESRCDIR) -d $(ZONEBLDDIR) $(<F)
 480
 481  # copy the zone/pool.res file from the source folder to the build output folder
 482  # and swap it to native endianness
 483  $(ZONEBLDDIR)/pool.res: $(ZONESRCDIR)/pool.res
 484         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ZONESRCDIR)/pool.res $(ZONEBLDDIR)/pool.res
 485
 486 -$(ZONEBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(ZONE_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 487 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(ZONE_TREE) -d $(ZONEBLDDIR) $(INDEX_NAME).txt
 488 +$(ZONEBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(ZONE_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 489 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(ZONE_TREE) -d $(ZONEBLDDIR) $(INDEX_NAME).txt
 490
 491  $(ZONE_INDEX_FILE): $(SRCLISTDEPS)
 492         @echo "generating $@ (list of installed time zone name locales)"; \
 493 @@ -691,7 +691,7 @@
 494
 495  ### unit res
 496  $(UNITBLDDIR)/%.res: $(UNITSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
 497 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(UNITSRCDIR) -d $(UNITBLDDIR) $(<F)
 498 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(UNITSRCDIR) -d $(UNITBLDDIR) $(<F)
 499
 500  # copy the unit/pool.res file from the source folder to the build output folder
 501  # and swap it to native endianness
 502 @@ -699,7 +699,7 @@
 503         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(UNITSRCDIR)/pool.res $(UNITBLDDIR)/pool.res
 504
 505  $(UNITBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(UNIT_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
 506 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(UNIT_TREE) -d $(UNITBLDDIR) $(INDEX_NAME).txt
 507 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(UNIT_TREE) -d $(UNITBLDDIR) $(INDEX_NAME).txt
 508
 509  $(UNIT_INDEX_FILE): $(SRCLISTDEPS)
 510         @echo "generating $@ (list of installed time zone name locales)"; \
 511 @@ -714,11 +714,11 @@
 512         echo "}" >> $@;
 513
 514  ### collation res
 515 -$(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 516 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
 517 +$(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 518 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
 519
 520 -$(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 521 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
 522 +$(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 523 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
 524
 525  $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
 526         @echo "generating $@ (list of installed collation locales)"; \
 527 @@ -733,11 +733,11 @@
 528         echo "}" >> $@;
 529
 530  ### brk res
 531 -$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DICT_FILES) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 532 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
 533 +$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DICT_FILES) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 534 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
 535
 536 -$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 537 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
 538 +$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 539 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
 540
 541  $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
 542         @echo "generating $@ (list of installed break locales)"; \
 543 @@ -752,11 +752,11 @@
 544         echo "}" >> $@;
 545
 546  ### RBNF res
 547 -$(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 548 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
 549 +$(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 550 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
 551
 552 -$(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 553 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
 554 +$(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 555 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
 556
 557  $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
 558         @echo "generating $@ (list of installed RBNF locales)"; \
 559 @@ -771,19 +771,19 @@
 560         echo "}" >> $@;
 561
 562  ### TRANSLIT res
 563 -$(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 564 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
 565 +$(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt  $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 566 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
 567
 568  ### normal (locale) res
 569  all-RES:  $(RES_FILES)
 570
 571 -$(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(BUILDDIR)/cnvalias.icu
 572 -       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
 573 +$(DATABUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) | $(DATABUILDDIR)/cnvalias.icu
 574 +       $(INVOKE) $(TOOLBINDIR)/genrb --usePoolBundle $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LOCSRCDIR) -d $(DATABUILDDIR) $(<F)
 575
 576  # copy the locales/pool.res file from the source folder to the build output folder
 577  # and swap it to native endianness
 578 -$(BUILDDIR)/pool.res: $(LOCSRCDIR)/pool.res
 579 -       $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LOCSRCDIR)/pool.res $(BUILDDIR)/pool.res
 580 +$(DATABUILDDIR)/pool.res: $(LOCSRCDIR)/pool.res
 581 +       $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(LOCSRCDIR)/pool.res $(DATABUILDDIR)/pool.res
 582
 583  # if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo
 584  ifeq ($(TZDATA),)
 585 @@ -797,9 +797,9 @@
 586
 587  # Override the normal genrb for zoneinfo to always pull from
 588  # icu/source/tools/tzcode/zoneinfo64.txt
 589 -$(BUILDDIR)/zoneinfo64.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 590 +$(DATABUILDDIR)/zoneinfo64.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 591         @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
 592 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
 593 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(ZONEINFO)
 594
 595  # Create the tzcode tool and zoneinfo as needed.
 596  $(ZONEINFO): $(TZDATA)
 597 @@ -810,8 +810,8 @@
 598  endif
 599
 600  # zoneinfo has some issues. Ignore some warnings with -q
 601 -$(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 602 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
 603 +$(DATABUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 604 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -s $(MISCSRCDIR) -d $(DATABUILDDIR) $(<F)
 605
 606
 607
 608 @@ -829,17 +829,17 @@
 609         echo "}" >> $@;
 610
 611  clean-resindex:
 612 -       -$(RMV) $(BUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
 613 +       -$(RMV) $(DATABUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
 614
 615 -$(BUILDDIR)/$(INDEX_NAME).res: $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(BUILDDIR)/cnvalias.icu
 616 -       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
 617 +$(DATABUILDDIR)/$(INDEX_NAME).res: $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT) | $(DATABUILDDIR)/cnvalias.icu
 618 +       $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(INDEX_FILE)
 619
 620  # The core Unicode properties files (pnames.icu, uprops.icu, ucase.icu, ubidi.icu)
 621  # are hardcoded in the common DLL and therefore not included in the data package any more.
 622  # They are not built by default but need to be built for ICU4J data and for getting the .c source files
 623  # when updating the Unicode data.
 624  uni-core-data: build-dir $(UNI_CORE_TARGET_DATA)
 625 -       @echo Unicode .icu files built to $(BUILDDIR)
 626 +       @echo Unicode .icu files built to $(DATABUILDDIR)
 627         echo timestamp > $@
 628
 629  # Build the ICU4J icudata.jar.
 630 @@ -862,7 +862,7 @@
 631         mkdir -p $(OUTDIR)/icu4j/$(ICU4J_DATA_DIRNAME)
 632         mkdir -p $(OUTDIR)/icu4j/tzdata/$(ICU4J_DATA_DIRNAME)
 633         echo $(UNI_CORE_DATA) > $(OUTDIR)/icu4j/add.txt
 634 -       $(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)
 635 +       $(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)
 636         mv $(ICU4J_TZDATA_PATHS:%=$(OUTDIR)/icu4j/%) "$(OUTDIR)/icu4j/tzdata/$(ICU4J_DATA_DIRNAME)"
 637
 638  $(OUTDIR)/icu4j/icutzdata.jar: generate-data
 639 diff -ruN icu/source/extra/uconv/Makefile.in icu.aros/source/extra/uconv/Makefile.in
 640 --- icu/source/extra/uconv/Makefile.in  2018-03-26 15:38:43.000000000 +0200
 641 +++ icu.aros/source/extra/uconv/Makefile.in     2018-04-16 01:31:39.833009232 +0200
 642 @@ -156,7 +156,7 @@
 643  $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
 644         $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
 645
 646 -$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
 647 +$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk $(RESFILES)
 648         @-$(RMV) $@
 649         @for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \
 650           echo $$file >> $@; \
 651 diff -ruN icu/source/i18n/Makefile.in icu.aros/source/i18n/Makefile.in
 652 --- icu/source/i18n/Makefile.in 2018-03-26 15:38:30.000000000 +0200
 653 +++ icu.aros/source/i18n/Makefile.in    2018-04-16 01:39:33.373393123 +0200
 654 @@ -29,7 +29,7 @@
 655  TARGET_STUBNAME=$(I18N_STUBNAME)
 656
 657  ifneq ($(ENABLE_STATIC),)
 658 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 659 +I18NTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 660  endif
 661
 662  ifneq ($(ENABLE_SHARED),)
 663 @@ -47,7 +47,7 @@
 664
 665  endif   # ENABLE_SHARED
 666
 667 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 668 +ALL_TARGETS = $(I18NTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 669
 670  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 671  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 672 @@ -146,7 +146,7 @@
 673  install-library: all-local
 674         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 675  ifneq ($(ENABLE_STATIC),)
 676 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 677 +       $(INSTALL-L) $(I18NTARGET) $(DESTDIR)$(libdir)
 678  endif
 679  ifneq ($(ENABLE_SHARED),)
 680         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 681 @@ -190,7 +190,7 @@
 682          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 683
 684  ifneq ($(ENABLE_STATIC),)
 685 -$(TARGET): $(STATIC_OBJECTS)
 686 +$(I18NTARGET): $(STATIC_OBJECTS)
 687         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 688         $(RANLIB) $@
 689  endif
 690 diff -ruN icu/source/io/Makefile.in icu.aros/source/io/Makefile.in
 691 --- icu/source/io/Makefile.in   2018-03-26 15:38:44.000000000 +0200
 692 +++ icu.aros/source/io/Makefile.in      2018-04-16 01:52:14.177014205 +0200
 693 @@ -29,7 +29,7 @@
 694  TARGET_STUBNAME=$(IO_STUBNAME)
 695
 696  ifneq ($(ENABLE_STATIC),)
 697 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 698 +IOTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 699  endif
 700
 701  ifneq ($(ENABLE_SHARED),)
 702 @@ -47,7 +47,7 @@
 703
 704  endif   # ENABLE_SHARED
 705
 706 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 707 +ALL_TARGETS = $(IOTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 708
 709  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 710  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 711 @@ -98,7 +98,7 @@
 712  install-library: all-local
 713         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 714  ifneq ($(ENABLE_STATIC),)
 715 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 716 +       $(INSTALL-L) $(IOTARGET) $(DESTDIR)$(libdir)
 717  endif
 718  ifneq ($(ENABLE_SHARED),)
 719         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 720 @@ -142,7 +142,7 @@
 721          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 722
 723  ifneq ($(ENABLE_STATIC),)
 724 -$(TARGET): $(STATIC_OBJECTS)
 725 +$(IOTARGET): $(STATIC_OBJECTS)
 726         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 727         $(RANLIB) $@
 728  endif
 729 diff -ruN icu/source/layoutex/Makefile.in icu.aros/source/layoutex/Makefile.in
 730 --- icu/source/layoutex/Makefile.in     2018-03-26 15:38:33.000000000 +0200
 731 +++ icu.aros/source/layoutex/Makefile.in        2018-04-16 01:52:51.273204508 +0200
 732 @@ -28,7 +28,7 @@
 733  TARGET_STUBNAME=$(LAYOUTEX_STUBNAME)
 734
 735  ifneq ($(ENABLE_STATIC),)
 736 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 737 +LAYEXTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 738  endif
 739
 740  ifneq ($(ENABLE_SHARED),)
 741 @@ -46,7 +46,7 @@
 742
 743  endif   # ENABLE_SHARED
 744
 745 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 746 +ALL_TARGETS = $(LAYEXTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
 747
 748  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 749  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 750 @@ -111,7 +111,7 @@
 751  install-library: all-local
 752         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 753  ifneq ($(ENABLE_STATIC),)
 754 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 755 +       $(INSTALL-L) $(LAYEXTARGET) $(DESTDIR)$(libdir)
 756  endif
 757  ifneq ($(ENABLE_SHARED),)
 758         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 759 @@ -155,7 +155,7 @@
 760          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 761
 762  ifneq ($(ENABLE_STATIC),)
 763 -$(TARGET): $(STATIC_OBJECTS)
 764 +$(LAYEXTARGET): $(STATIC_OBJECTS)
 765         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 766         $(RANLIB) $@
 767  endif
 768 diff -ruN icu/source/stubdata/Makefile.in icu.aros/source/stubdata/Makefile.in
 769 --- icu/source/stubdata/Makefile.in     2018-03-26 15:38:44.000000000 +0200
 770 +++ icu.aros/source/stubdata/Makefile.in        2018-04-16 01:57:23.901465449 +0200
 771 @@ -29,7 +29,7 @@
 772  TARGET_STUBNAME=$(DATA_STUBNAME)
 773
 774  ifneq ($(ENABLE_STATIC),)
 775 -TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 776 +STUBTARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 777  endif
 778
 779
 780 @@ -39,7 +39,7 @@
 781  endif
 782
 783
 784 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
 785 +ALL_TARGETS = $(STUBTARGET) $(ALL_SO_TARGETS)
 786
 787  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 788  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 789 @@ -84,7 +84,7 @@
 790  install-library: all-local
 791         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 792  ifneq ($(ENABLE_STATIC),)
 793 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 794 +       $(INSTALL-L) $(STUBTARGET) $(DESTDIR)$(libdir)
 795  endif
 796  ifneq ($(ENABLE_SHARED),)
 797         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 798 @@ -121,7 +121,7 @@
 799         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 800
 801  ifneq ($(ENABLE_STATIC),)
 802 -$(TARGET): $(STATIC_OBJECTS)
 803 +$(STUBTARGET): $(STATIC_OBJECTS)
 804         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 805         $(RANLIB) $@
 806  endif
 807 diff -ruN icu/source/tools/ctestfw/Makefile.in icu.aros/source/tools/ctestfw/Makefile.in
 808 --- icu/source/tools/ctestfw/Makefile.in        2018-03-26 15:38:31.000000000 +0200
 809 +++ icu.aros/source/tools/ctestfw/Makefile.in   2018-04-16 02:09:33.241113175 +0200
 810 @@ -29,7 +29,7 @@
 811  TARGET_STUBNAME=$(CTESTFW_STUBNAME)
 812
 813  ifneq ($(ENABLE_STATIC),)
 814 -TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 815 +CTFWTARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 816  endif
 817
 818  ifneq ($(ENABLE_SHARED),)
 819 @@ -37,7 +37,7 @@
 820  ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
 821  endif
 822
 823 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
 824 +ALL_TARGETS = $(CTFWTARGET) $(ALL_SO_TARGETS)
 825
 826  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 827  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 828 @@ -80,7 +80,7 @@
 829  install-library: all-local
 830         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 831  ifneq ($(ENABLE_STATIC),)
 832 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
 833 +       $(INSTALL-L) $(CTFWTARGET) $(DESTDIR)$(libdir)
 834  endif
 835  ifneq ($(ENABLE_SHARED),)
 836         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
 837 @@ -117,7 +117,7 @@
 838          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 839
 840  ifneq ($(ENABLE_STATIC),)
 841 -$(TARGET): $(STATIC_OBJECTS)
 842 +$(CTFWTARGET): $(STATIC_OBJECTS)
 843         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
 844         $(RANLIB) $@
 845  endif
 846 diff -ruN icu/source/tools/escapesrc/Makefile.in icu.aros/source/tools/escapesrc/Makefile.in
 847 --- icu/source/tools/escapesrc/Makefile.in      2018-03-26 15:38:31.000000000 +0200
 848 +++ icu.aros/source/tools/escapesrc/Makefile.in 2018-04-16 02:10:37.053119163 +0200
 849 @@ -29,7 +29,7 @@
 850  CLEANFILES = *~ $(DEPS) $(MAN_FILES) ./output-*.cpp
 851
 852  ## Target information
 853 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 854 +ESRCTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 855
 856  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 857  #LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC)
 858 @@ -54,11 +54,11 @@
 859  dist: dist-local
 860  check: all check-local
 861
 862 -all-local: $(TARGET) $(MAN_FILES)
 863 +all-local: $(ESRCTARGET) $(MAN_FILES)
 864
 865  install-local: all-local install-man
 866         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
 867 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
 868 +       $(INSTALL) $(ESRCTARGET) $(DESTDIR)$(sbindir)
 869
 870  install-man: $(MAN_FILES)
 871  #      $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 872 @@ -69,24 +69,24 @@
 873
 874  clean-local:
 875         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 876 -       $(RMV) $(TARGET) $(OBJECTS)
 877 +       $(RMV) $(ESRCTARGET) $(OBJECTS)
 878
 879  distclean-local: clean-local
 880         $(RMV) Makefile
 881
 882  check-local: all-local
 883         @echo Testing test-nochange.cpp
 884 -       @$(INVOKE) $(TARGET) $(srcdir)/test-nochange.cpp ./output-nochange.cpp
 885 +       @$(INVOKE) $(ESRCTARGET) $(srcdir)/test-nochange.cpp ./output-nochange.cpp
 886         @-diff -I '#line.*' $(srcdir)/test-nochange.cpp ./output-nochange.cpp || (echo >&2 'warning: diff failed or not found' ; true)
 887         @echo Testing test-simple.cpp
 888 -       @$(INVOKE) $(TARGET) $(srcdir)/test-simple.cpp ./output-simple.cpp
 889 +       @$(INVOKE) $(ESRCTARGET) $(srcdir)/test-simple.cpp ./output-simple.cpp
 890         @-diff -I '#line.*' $(srcdir)/expect-simple.cpp ./output-simple.cpp   || (echo >&2 'warning: diff failed or not found' ; true)
 891
 892  Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 893         cd $(top_builddir) \
 894          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 895
 896 -$(TARGET) : $(OBJECTS)
 897 +$(ESRCTARGET) : $(OBJECTS)
 898         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 899         $(POST_BUILD_STEP)
 900
 901 diff -ruN icu/source/tools/genbrk/Makefile.in icu.aros/source/tools/genbrk/Makefile.in
 902 --- icu/source/tools/genbrk/Makefile.in 2018-03-26 15:38:31.000000000 +0200
 903 +++ icu.aros/source/tools/genbrk/Makefile.in    2018-04-16 02:11:14.217253373 +0200
 904 @@ -26,7 +26,7 @@
 905  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 906
 907  ## Target information
 908 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 909 +GBRKTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 910
 911  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 912  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 913 @@ -50,11 +50,11 @@
 914  dist: dist-local
 915  check: all check-local
 916
 917 -all-local: $(TARGET) $(MAN_FILES)
 918 +all-local: $(GBRKTARGET) $(MAN_FILES)
 919
 920  install-local: all-local install-man
 921         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 922 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
 923 +       $(INSTALL) $(GBRKTARGET) $(DESTDIR)$(bindir)
 924
 925  install-man: $(MAN_FILES)
 926         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 927 @@ -64,7 +64,7 @@
 928
 929  clean-local:
 930         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 931 -       $(RMV) $(TARGET) $(OBJECTS)
 932 +       $(RMV) $(GBRKTARGET) $(OBJECTS)
 933
 934  distclean-local: clean-local
 935         $(RMV) Makefile
 936 @@ -75,7 +75,7 @@
 937         cd $(top_builddir) \
 938          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 939
 940 -$(TARGET) : $(OBJECTS)
 941 +$(GBRKTARGET) : $(OBJECTS)
 942         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 943         $(POST_BUILD_STEP)
 944
 945 diff -ruN icu/source/tools/genccode/Makefile.in icu.aros/source/tools/genccode/Makefile.in
 946 --- icu/source/tools/genccode/Makefile.in       2018-03-26 15:38:31.000000000 +0200
 947 +++ icu.aros/source/tools/genccode/Makefile.in  2018-04-16 02:11:30.953198380 +0200
 948 @@ -27,7 +27,7 @@
 949  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 950
 951  ## Target information
 952 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 953 +GCODETARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 954
 955  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
 956  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 957 @@ -51,11 +51,11 @@
 958  dist: dist-local
 959  check: all check-local
 960
 961 -all-local: $(TARGET) $(MAN_FILES)
 962 +all-local: $(GCODETARGET) $(MAN_FILES)
 963
 964  install-local: all-local install-man
 965         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
 966 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
 967 +       $(INSTALL) $(GCODETARGET) $(DESTDIR)$(sbindir)
 968
 969  install-man: $(MAN_FILES)
 970         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
 971 @@ -65,7 +65,7 @@
 972
 973  clean-local:
 974         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 975 -       $(RMV) $(TARGET) $(OBJECTS)
 976 +       $(RMV) $(GCODETARGET) $(OBJECTS)
 977
 978  distclean-local: clean-local
 979         $(RMV) Makefile
 980 @@ -76,7 +76,7 @@
 981         cd $(top_builddir) \
 982          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 983
 984 -$(TARGET) : $(OBJECTS)
 985 +$(GCODETARGET) : $(OBJECTS)
 986         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 987         $(POST_BUILD_STEP)
 988
 989 diff -ruN icu/source/tools/gencfu/Makefile.in icu.aros/source/tools/gencfu/Makefile.in
 990 --- icu/source/tools/gencfu/Makefile.in 2018-03-26 15:38:31.000000000 +0200
 991 +++ icu.aros/source/tools/gencfu/Makefile.in    2018-04-16 02:11:54.517127066 +0200
 992 @@ -26,7 +26,7 @@
 993  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 994
 995  ## Target information
 996 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 997 +GCFUTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 998
 999  CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
1000  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1001 @@ -50,11 +50,11 @@
1002  dist: dist-local
1003  check: all check-local
1004
1005 -all-local: $(TARGET) $(MAN_FILES)
1006 +all-local: $(GCFUTARGET) $(MAN_FILES)
1007
1008  install-local: all-local install-man
1009         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1010 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1011 +       $(INSTALL) $(GCFUTARGET) $(DESTDIR)$(bindir)
1012
1013  install-man: $(MAN_FILES)
1014         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1015 @@ -64,7 +64,7 @@
1016
1017  clean-local:
1018         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1019 -       $(RMV) $(TARGET) $(OBJECTS)
1020 +       $(RMV) $(GCFUTARGET) $(OBJECTS)
1021
1022  distclean-local: clean-local
1023         $(RMV) Makefile
1024 @@ -75,7 +75,7 @@
1025         cd $(top_builddir) \
1026          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1027
1028 -$(TARGET) : $(OBJECTS)
1029 +$(GCFUTARGET) : $(OBJECTS)
1030         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1031         $(POST_BUILD_STEP)
1032
1033 diff -ruN icu/source/tools/gencmn/Makefile.in icu.aros/source/tools/gencmn/Makefile.in
1034 --- icu/source/tools/gencmn/Makefile.in 2018-03-26 15:38:31.000000000 +0200
1035 +++ icu.aros/source/tools/gencmn/Makefile.in    2018-04-16 02:12:16.153082200 +0200
1036 @@ -27,7 +27,7 @@
1037  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1038
1039  ## Target information
1040 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1041 +GCMNTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1042
1043  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1044  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1045 @@ -51,11 +51,11 @@
1046  dist: dist-local
1047  check: all check-local
1048
1049 -all-local: $(TARGET) $(MAN_FILES)
1050 +all-local: $(GCMNTARGET) $(MAN_FILES)
1051
1052  install-local: all-local install-man
1053         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1054 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1055 +       $(INSTALL) $(GCMNTARGET) $(DESTDIR)$(sbindir)
1056
1057  install-man: $(MAN_FILES)
1058         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1059 @@ -65,7 +65,7 @@
1060
1061  clean-local:
1062         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1063 -       $(RMV) $(TARGET) $(OBJECTS)
1064 +       $(RMV) $(GCMNTARGET) $(OBJECTS)
1065
1066  distclean-local: clean-local
1067         $(RMV) Makefile
1068 @@ -76,7 +76,7 @@
1069         cd $(top_builddir) \
1070          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1071
1072 -$(TARGET) : $(OBJECTS)
1073 +$(GCMNTARGET) : $(OBJECTS)
1074         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1075         $(POST_BUILD_STEP)
1076
1077 diff -ruN icu/source/tools/gencnval/Makefile.in icu.aros/source/tools/gencnval/Makefile.in
1078 --- icu/source/tools/gencnval/Makefile.in       2018-03-26 15:38:31.000000000 +0200
1079 +++ icu.aros/source/tools/gencnval/Makefile.in  2018-04-16 02:12:44.049260335 +0200
1080 @@ -27,7 +27,7 @@
1081  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1082
1083  ## Target information
1084 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1085 +GCNVALTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1086
1087  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1088  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1089 @@ -51,11 +51,11 @@
1090  dist: dist-local
1091  check: all check-local
1092
1093 -all-local: $(TARGET) $(MAN_FILES)
1094 +all-local: $(GCNVALTARGET) $(MAN_FILES)
1095
1096  install-local: all-local install-man
1097         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1098 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1099 +       $(INSTALL) $(GCNVALTARGET) $(DESTDIR)$(bindir)
1100
1101  install-man: $(MAN_FILES)
1102         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1103 @@ -65,7 +65,7 @@
1104
1105  clean-local:
1106         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1107 -       $(RMV) $(TARGET) $(OBJECTS)
1108 +       $(RMV) $(GCNVALTARGET) $(OBJECTS)
1109
1110  distclean-local: clean-local
1111         $(RMV) Makefile
1112 @@ -76,7 +76,7 @@
1113         cd $(top_builddir) \
1114          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1115
1116 -$(TARGET) : $(OBJECTS)
1117 +$(GCNVALTARGET) : $(OBJECTS)
1118         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1119         $(POST_BUILD_STEP)
1120
1121 diff -ruN icu/source/tools/gendict/Makefile.in icu.aros/source/tools/gendict/Makefile.in
1122 --- icu/source/tools/gendict/Makefile.in        2018-03-26 15:38:31.000000000 +0200
1123 +++ icu.aros/source/tools/gendict/Makefile.in   2018-04-16 02:13:02.365342434 +0200
1124 @@ -26,7 +26,7 @@
1125  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1126
1127  ## Target information
1128 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1129 +GDCTTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1130
1131  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1132  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1133 @@ -50,11 +50,11 @@
1134  dist: dist-local
1135  check: all check-local
1136
1137 -all-local: $(TARGET) $(MAN_FILES)
1138 +all-local: $(GDCTTARGET) $(MAN_FILES)
1139
1140  install-local: all-local install-man
1141         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1142 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1143 +       $(INSTALL) $(GDCTTARGET) $(DESTDIR)$(bindir)
1144
1145  install-man: $(MAN_FILES)
1146         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1147 @@ -64,7 +64,7 @@
1148
1149  clean-local:
1150         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1151 -       $(RMV) $(TARGET) $(OBJECTS)
1152 +       $(RMV) $(GDCTTARGET) $(OBJECTS)
1153
1154  distclean-local: clean-local
1155         $(RMV) Makefile
1156 @@ -75,7 +75,7 @@
1157         cd $(top_builddir) \
1158          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1159
1160 -$(TARGET) : $(OBJECTS)
1161 +$(GDCTTARGET) : $(OBJECTS)
1162         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1163         $(POST_BUILD_STEP)
1164
1165 diff -ruN icu/source/tools/gennorm2/Makefile.in icu.aros/source/tools/gennorm2/Makefile.in
1166 --- icu/source/tools/gennorm2/Makefile.in       2018-03-26 15:38:31.000000000 +0200
1167 +++ icu.aros/source/tools/gennorm2/Makefile.in  2018-04-16 02:13:18.913380866 +0200
1168 @@ -22,7 +22,7 @@
1169  CLEANFILES = *~ $(DEPS)
1170
1171  ## Target information
1172 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1173 +GNR2TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1174
1175  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1176  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1177 @@ -46,17 +46,17 @@
1178  dist: dist-local
1179  check: all check-local
1180
1181 -all-local: $(TARGET)
1182 +all-local: $(GNR2TARGET)
1183
1184  install-local: all-local
1185         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1186 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1187 +       $(INSTALL) $(GNR2TARGET) $(DESTDIR)$(sbindir)
1188
1189  dist-local:
1190
1191  clean-local:
1192         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1193 -       $(RMV) $(TARGET) $(OBJECTS)
1194 +       $(RMV) $(GNR2TARGET) $(OBJECTS)
1195
1196  distclean-local: clean-local
1197         $(RMV) Makefile
1198 @@ -67,7 +67,7 @@
1199         cd $(top_builddir) \
1200          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1201
1202 -$(TARGET) : $(OBJECTS)
1203 +$(GNR2TARGET) : $(OBJECTS)
1204         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1205         $(POST_BUILD_STEP)
1206
1207 diff -ruN icu/source/tools/genrb/Makefile.in icu.aros/source/tools/genrb/Makefile.in
1208 --- icu/source/tools/genrb/Makefile.in  2018-03-26 15:38:31.000000000 +0200
1209 +++ icu.aros/source/tools/genrb/Makefile.in     2018-04-16 02:13:39.637324361 +0200
1210 @@ -29,7 +29,7 @@
1211  CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS)
1212
1213  ## Target information
1214 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1215 +GRBTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1216  # derb depends on icuio
1217  @ICUIO_TRUE@DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
1218
1219 @@ -61,11 +61,11 @@
1220  dist: dist-local
1221  check: all check-local
1222
1223 -all-local: $(TARGET) $(DERB) $(MAN_FILES)
1224 +all-local: $(GRBTARGET) $(DERB) $(MAN_FILES)
1225
1226  install-local: all-local install-man
1227         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1228 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1229 +       $(INSTALL) $(GRBTARGET) $(DESTDIR)$(bindir)
1230  @ICUIO_TRUE@   $(INSTALL) $(DERB) $(DESTDIR)$(bindir)
1231
1232  install-man: $(MAN_FILES)
1233 @@ -76,7 +76,7 @@
1234
1235  clean-local:
1236         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1237 -       $(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ)
1238 +       $(RMV) $(GRBTARGET) $(DERB) $(OBJECTS) $(DERB_OBJ)
1239
1240  distclean-local: clean-local
1241         $(RMV) Makefile
1242 @@ -87,7 +87,7 @@
1243         cd $(top_builddir) \
1244          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1245
1246 -$(TARGET) : $(OBJECTS)
1247 +$(GRBTARGET) : $(OBJECTS)
1248         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1249         $(POST_BUILD_STEP)
1250
1251 diff -ruN icu/source/tools/gensprep/Makefile.in icu.aros/source/tools/gensprep/Makefile.in
1252 --- icu/source/tools/gensprep/Makefile.in       2018-03-26 15:38:31.000000000 +0200
1253 +++ icu.aros/source/tools/gensprep/Makefile.in  2018-04-16 02:14:02.261281034 +0200
1254 @@ -27,7 +27,7 @@
1255  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1256
1257  ## Target information
1258 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1259 +GSPREPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1260
1261  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1262  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1263 @@ -51,11 +51,11 @@
1264  dist: dist-local
1265  check: all check-local
1266
1267 -all-local: $(TARGET) $(MAN_FILES)
1268 +all-local: $(GSPREPTARGET) $(MAN_FILES)
1269
1270  install-local: all-local install-man
1271         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1272 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1273 +       $(INSTALL) $(GSPREPTARGET) $(DESTDIR)$(sbindir)
1274
1275  install-man: $(MAN_FILES)
1276         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1277 @@ -65,7 +65,7 @@
1278
1279  clean-local:
1280         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1281 -       $(RMV) $(TARGET) $(OBJECTS)
1282 +       $(RMV) $(GSPREPTARGET) $(OBJECTS)
1283
1284  distclean-local: clean-local
1285         $(RMV) Makefile
1286 @@ -76,7 +76,7 @@
1287         cd $(top_builddir) \
1288          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1289
1290 -$(TARGET) : $(OBJECTS)
1291 +$(GSPREPTARGET) : $(OBJECTS)
1292         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1293         $(POST_BUILD_STEP)
1294
1295 diff -ruN icu/source/tools/gentest/Makefile.in icu.aros/source/tools/gentest/Makefile.in
1296 --- icu/source/tools/gentest/Makefile.in        2018-03-26 15:38:31.000000000 +0200
1297 +++ icu.aros/source/tools/gentest/Makefile.in   2018-04-16 02:14:18.081275792 +0200
1298 @@ -20,7 +20,7 @@
1299  CLEANFILES = *~ $(DEPS)
1300
1301  ## Target information
1302 -TARGET = gentest$(EXEEXT)
1303 +GTESTTARGET = gentest$(EXEEXT)
1304
1305  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw
1306  CPPFLAGS+= -I$(top_srcdir)/i18n
1307 @@ -45,7 +45,7 @@
1308  dist: dist-local
1309  check: all check-local
1310
1311 -all-local: $(TARGET)
1312 +all-local: $(GTESTTARGET)
1313
1314  install-local: all-local
1315
1316 @@ -53,7 +53,7 @@
1317
1318  clean-local:
1319         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1320 -       $(RMV) $(TARGET) $(OBJECTS)
1321 +       $(RMV) $(GTESTTARGET) $(OBJECTS)
1322
1323  distclean-local: clean-local
1324         $(RMV) Makefile
1325 @@ -64,7 +64,7 @@
1326         cd $(top_builddir) \
1327          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1328
1329 -$(TARGET) : $(OBJECTS)
1330 +$(GTESTTARGET) : $(OBJECTS)
1331         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1332         $(POST_BUILD_STEP)
1333
1334 diff -ruN icu/source/tools/icuinfo/Makefile.in icu.aros/source/tools/icuinfo/Makefile.in
1335 --- icu/source/tools/icuinfo/Makefile.in        2018-03-26 15:38:31.000000000 +0200
1336 +++ icu.aros/source/tools/icuinfo/Makefile.in   2018-04-16 02:14:45.177423429 +0200
1337 @@ -20,7 +20,7 @@
1338  CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
1339
1340  ## Target information
1341 -TARGET = icuinfo$(EXEEXT)
1342 +IINFTARGET = icuinfo$(EXEEXT)
1343
1344  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw
1345  CPPFLAGS+= -I$(top_srcdir)/i18n
1346 @@ -50,30 +50,30 @@
1347  dist: dist-local
1348  check: all check-local
1349
1350 -all-local: $(TARGET)
1351 +all-local: $(IINFTARGET)
1352
1353  install-local: all-local
1354         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1355 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1356 +       $(INSTALL) $(IINFTARGET) $(DESTDIR)$(bindir)
1357
1358  dist-local:
1359
1360  clean-local:
1361         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1362 -       $(RMV) $(TARGET) $(OBJECTS)
1363 +       $(RMV) $(IINFTARGET) $(OBJECTS)
1364
1365  distclean-local: clean-local
1366         $(RMV) Makefile
1367
1368 -check-local: $(TARGET)
1369 -       $(INVOKE) ./$(TARGET) $(ICUINFO_OPTS)
1370 +check-local: $(IINFTARGET)
1371 +       $(INVOKE) ./$(IINFTARGET) $(ICUINFO_OPTS)
1372
1373  Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
1374         cd $(top_builddir) \
1375          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1376  -include Makefile.local
1377
1378 -$(TARGET) : $(OBJECTS)
1379 +$(IINFTARGET) : $(OBJECTS)
1380         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1381         $(POST_BUILD_STEP)
1382
1383 @@ -99,7 +99,7 @@
1384  plugin: $(PLUGIN)
1385
1386  plugin-check: $(PLUGIN) $(PLUGINFILE)
1387 -       $(INVOKE) ICU_PLUGINS="$(CURR_FULL_DIR)" ./$(TARGET) -v -L
1388 +       $(INVOKE) ICU_PLUGINS="$(CURR_FULL_DIR)" ./$(IINFTARGET) -v -L
1389  else
1390  plugin plugin-check $(PLUGIN):
1391         @echo "Plugins are disabled (use --enable-plugins to enable)"
1392 diff -ruN icu/source/tools/icupkg/Makefile.in icu.aros/source/tools/icupkg/Makefile.in
1393 --- icu/source/tools/icupkg/Makefile.in 2018-03-26 15:38:31.000000000 +0200
1394 +++ icu.aros/source/tools/icupkg/Makefile.in    2018-04-16 02:15:04.053497317 +0200
1395 @@ -26,7 +26,7 @@
1396  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1397
1398  ## Target information
1399 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1400 +ICUPKGTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1401
1402  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1403  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1404 @@ -50,11 +50,11 @@
1405  dist: dist-local
1406  check: all check-local
1407
1408 -all-local: $(TARGET) $(MAN_FILES)
1409 +all-local: $(ICUPKGTARGET) $(MAN_FILES)
1410
1411  install-local: all-local install-man
1412         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1413 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1414 +       $(INSTALL) $(ICUPKGTARGET) $(DESTDIR)$(sbindir)
1415
1416  install-man: $(MAN_FILES)
1417         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1418 @@ -65,7 +65,7 @@
1419
1420  clean-local:
1421         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1422 -       $(RMV) $(TARGET) $(OBJECTS)
1423 +       $(RMV) $(ICUPKGTARGET) $(OBJECTS)
1424
1425  distclean-local: clean-local
1426         $(RMV) Makefile
1427 @@ -76,7 +76,7 @@
1428         cd $(top_builddir) \
1429          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1430
1431 -$(TARGET) : $(OBJECTS)
1432 +$(ICUPKGTARGET) : $(OBJECTS)
1433         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1434         $(POST_BUILD_STEP)
1435
1436 diff -ruN icu/source/tools/icuswap/Makefile.in icu.aros/source/tools/icuswap/Makefile.in
1437 --- icu/source/tools/icuswap/Makefile.in        2018-03-26 15:38:31.000000000 +0200
1438 +++ icu.aros/source/tools/icuswap/Makefile.in   2018-04-16 02:15:23.605477565 +0200
1439 @@ -26,7 +26,7 @@
1440  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1441
1442  ## Target information
1443 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1444 +ICUSWPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1445
1446  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1447  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1448 @@ -50,11 +50,11 @@
1449  dist: dist-local
1450  check: all check-local
1451
1452 -all-local: $(TARGET) $(MAN_FILES)
1453 +all-local: $(ICUSWPTARGET) $(MAN_FILES)
1454
1455  install-local: all-local install-man
1456         $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1457 -       $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1458 +       $(INSTALL) $(ICUSWPTARGET) $(DESTDIR)$(sbindir)
1459
1460  install-man: $(MAN_FILES)
1461  #      $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1462 @@ -65,7 +65,7 @@
1463
1464  clean-local:
1465         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1466 -       $(RMV) $(TARGET) $(OBJECTS)
1467 +       $(RMV) $(ICUSWPTARGET) $(OBJECTS)
1468
1469  distclean-local: clean-local
1470         $(RMV) Makefile
1471 @@ -76,7 +76,7 @@
1472         cd $(top_builddir) \
1473          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1474
1475 -$(TARGET) : $(OBJECTS)
1476 +$(ICUSWPTARGET) : $(OBJECTS)
1477         echo Note: icuswap is obsolete - use icupkg instead.
1478         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1479         $(POST_BUILD_STEP)
1480 diff -ruN icu/source/tools/makeconv/Makefile.in icu.aros/source/tools/makeconv/Makefile.in
1481 --- icu/source/tools/makeconv/Makefile.in       2018-03-26 15:38:31.000000000 +0200
1482 +++ icu.aros/source/tools/makeconv/Makefile.in  2018-04-16 02:15:40.745371007 +0200
1483 @@ -26,7 +26,7 @@
1484  CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1485
1486  ## Target information
1487 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1488 +MAKECONVTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1489
1490  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1491  LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
1492 @@ -50,11 +50,11 @@
1493  dist: dist-local
1494  check: all check-local
1495
1496 -all-local: $(TARGET) $(MAN_FILES)
1497 +all-local: $(MAKECONVTARGET) $(MAN_FILES)
1498
1499  install-local: all-local install-man
1500         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1501 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1502 +       $(INSTALL) $(MAKECONVTARGET) $(DESTDIR)$(bindir)
1503
1504  install-man: $(MAN_FILES)
1505         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1506 @@ -65,7 +65,7 @@
1507
1508  clean-local:
1509         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1510 -       $(RMV) $(TARGET) $(OBJECTS)
1511 +       $(RMV) $(MAKECONVTARGET) $(OBJECTS)
1512
1513  distclean-local: clean-local
1514         $(RMV) Makefile
1515 @@ -76,7 +76,7 @@
1516         cd $(top_builddir) \
1517          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1518
1519 -$(TARGET) : $(OBJECTS)
1520 +$(MAKECONVTARGET) : $(OBJECTS)
1521         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1522         $(POST_BUILD_STEP)
1523
1524 diff -ruN icu/source/tools/pkgdata/Makefile.in icu.aros/source/tools/pkgdata/Makefile.in
1525 --- icu/source/tools/pkgdata/Makefile.in        2018-03-26 15:38:31.000000000 +0200
1526 +++ icu.aros/source/tools/pkgdata/Makefile.in   2018-04-16 02:15:59.269283779 +0200
1527 @@ -30,7 +30,7 @@
1528  endif
1529
1530  ## Target information
1531 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1532 +PKGDATATARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1533
1534  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(srcdir)/../toolutil
1535  DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
1536 @@ -55,11 +55,11 @@
1537  dist: dist-local
1538  check: all check-local
1539
1540 -all-local: $(TARGET) $(MAN_FILES)
1541 +all-local: $(PKGDATATARGET) $(MAN_FILES)
1542
1543  install-local: all-local install-man
1544         $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1545 -       $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1546 +       $(INSTALL) $(PKGDATATARGET) $(DESTDIR)$(bindir)
1547
1548  install-man: $(MAN_FILES)
1549         $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1550 @@ -70,7 +70,7 @@
1551
1552  clean-local:
1553         test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1554 -       $(RMV) $(TARGET) $(OBJECTS)
1555 +       $(RMV) $(PKGDATATARGET) $(OBJECTS)
1556
1557  distclean-local: clean-local
1558         $(RMV) Makefile
1559 @@ -81,7 +81,7 @@
1560         cd $(top_builddir) \
1561          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1562
1563 -$(TARGET) : $(OBJECTS)
1564 +$(PKGDATATARGET) : $(OBJECTS)
1565         $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1566         $(POST_BUILD_STEP)
1567
1568 diff -ruN icu/source/tools/toolutil/Makefile.in icu.aros/source/tools/toolutil/Makefile.in
1569 --- icu/source/tools/toolutil/Makefile.in       2018-03-26 15:38:31.000000000 +0200
1570 +++ icu.aros/source/tools/toolutil/Makefile.in  2018-04-16 02:16:19.797200961 +0200
1571 @@ -29,7 +29,7 @@
1572  TARGET_STUBNAME=$(TOOLUTIL_STUBNAME)
1573
1574  ifneq ($(ENABLE_STATIC),)
1575 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1576 +TOOLUTILTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1577  endif
1578
1579  ifneq ($(ENABLE_SHARED),)
1580 @@ -37,7 +37,7 @@
1581  ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
1582  endif
1583
1584 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
1585 +ALL_TARGETS = $(TOOLUTILTARGET) $(ALL_SO_TARGETS)
1586
1587  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1588  DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1589 @@ -91,7 +91,7 @@
1590  install-library: all-local
1591         $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1592  ifneq ($(ENABLE_STATIC),)
1593 -       $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1594 +       $(INSTALL-L) $(TOOLUTILTARGET) $(DESTDIR)$(libdir)
1595  endif
1596  ifneq ($(ENABLE_SHARED),)
1597         $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1598 @@ -128,7 +128,7 @@
1599          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1600
1601  ifneq ($(ENABLE_STATIC),)
1602 -$(TARGET): $(STATIC_OBJECTS)
1603 +$(TOOLUTILTARGET): $(STATIC_OBJECTS)
1604         $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1605         $(RANLIB) $@
1606  endif