?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fixed one or more race conditions that sometimes led to layout of the
[AROS.git] / tools / crosstools / icu4c-4_2_1-src-aros.diff
blob8a14830069b4f54278d269585fc70c378cbfc8a2
1 diff -ruN icu/source/common/Makefile.in icu.aros/source/common/Makefile.in
2 --- icu/source/common/Makefile.in 2009-07-01 19:50:38.000000000 +0100
3 +++ icu.aros/source/common/Makefile.in 2013-04-09 21:16:17.787473921 +0100
4 @@ -31,7 +31,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 @@ -49,7 +49,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 @@ -124,7 +124,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 @@ -180,7 +180,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/unicode/umachine.h icu.aros/source/common/unicode/umachine.h
41 --- icu/source/common/unicode/umachine.h 2009-07-01 19:50:34.000000000 +0100
42 +++ icu.aros/source/common/unicode/umachine.h 2013-04-09 21:17:06.520139711 +0100
43 @@ -273,6 +273,10 @@
44 # endif
45 # elif defined(U_WINDOWS)
46 # define U_WCHAR_IS_UTF16
47 +# elif defined(__AROS__)
48 +# if (U_SIZEOF_WCHAR_T==4)
49 +# define U_WCHAR_IS_UTF32
50 +# endif
51 # endif
52 #endif
53
54 diff -ruN icu/source/config/mh-aros icu.aros/source/config/mh-aros
55 --- icu/source/config/mh-aros 1970-01-01 01:00:00.000000000 +0100
56 +++ icu.aros/source/config/mh-aros 2013-04-09 21:11:20.927496769 +0100
57 @@ -0,0 +1,76 @@
58 +## AROS-specific setup
59 +
60 +## Commands to generate dependency files
61 +GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
62 +GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
63 +
64 +## Flags for position independent code
65 +SHAREDLIBCFLAGS =
66 +SHAREDLIBCXXFLAGS =
67 +SHAREDLIBCPPFLAGS =
68 +
69 +## Additional flags when building libraries and with threads
70 +THREADSCPPFLAGS = -D_REENTRANT
71 +LIBCPPFLAGS =
72 +
73 +## Compiler switch to embed a runtime search path
74 +LD_RPATH=
75 +LD_RPATH_PRE = -Wl,-rpath,
76 +
77 +## These are the library specific LDFLAGS
78 +LDFLAGSICUDT=-nodefaultlibs -nostdlib
79 +
80 +## Compiler switch to embed a library name
81 +LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
82 +
83 +## Shared object suffix
84 +SO = so
85 +## Non-shared intermediate object suffix
86 +STATIC_O = ao
87 +
88 +## Compilation rules
89 +%.$(STATIC_O): $(srcdir)/%.c
90 + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
91 +%.o: $(srcdir)/%.c
92 + $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
93 +
94 +%.$(STATIC_O): $(srcdir)/%.cpp
95 + $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
96 +%.o: $(srcdir)/%.cpp
97 + $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
98 +
99 +
100 +## Dependency rules
101 +%.d: $(srcdir)/%.c
102 + @echo "generating dependency information for $<"
103 + @$(SHELL) -ec '$(GEN_DEPS.c) $< \
104 + | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
105 + [ -s $@ ] || rm -f $@'
106 +
107 +%.d: $(srcdir)/%.cpp
108 + @echo "generating dependency information for $<"
109 + @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
110 + | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
111 + [ -s $@ ] || rm -f $@'
112 +
113 +## Versioned libraries rules
114 +
115 +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
116 + $(RM) $@ && ln -s ${<F} $@
117 +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
118 + $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
119 +
120 +## Bind internal references
121 +
122 +# LDflags that pkgdata will use
123 +BIR_LDFLAGS= -Wl,-Bsymbolic
124 +
125 +# Dependencies [i.e. map files] for the final library
126 +BIR_DEPS=
127 +
128 +## Remove shared library 's'
129 +STATIC_PREFIX_WHEN_USED =
130 +STATIC_PREFIX =
131 +
132 +## End AROS-specific setup
133 +
134 diff -ruN icu/source/configure icu.aros/source/configure
135 --- icu/source/configure 2009-07-01 19:51:26.000000000 +0100
136 +++ icu.aros/source/configure 2013-04-09 21:17:15.022255807 +0100
137 @@ -4110,19 +4110,16 @@
138 *) ;;
139 esac
140 elif test "$DEFAULT_64BIT" = "unknown"; then
141 - { { $as_echo "$as_me:$LINENO: error: Unable to determine binary format." >&5
142 -$as_echo "$as_me: error: Unable to determine binary format." >&2;}
143 - { (exit 1); exit 1; }; }
144 - # cross compiling?
145 - #BITS_GOT=unknown
146 - #case "$BITS_REQ" in
147 - # 64|64else32) BITS_OK=no
148 - # BITS_CHECK_32=yes
149 - # BITS_CHECK_64=yes
150 - # 32) BITS_OK=no;;
151 - # nochange) ;;
152 - # *) ;;
153 - #esac
154 + # cross compiling.
155 + BITS_GOT=unknown
156 + case "$BITS_REQ" in
157 + 64|64else32) BITS_OK=no
158 + BITS_CHECK_32=yes
159 + BITS_CHECK_64=yes ;;
160 + 32) BITS_OK=no;;
161 + nochange) ;;
162 + *) ;;
163 + esac
164 fi
165
166 { $as_echo "$as_me:$LINENO: result: $DEFAULT_64BIT" >&5
167 @@ -4780,6 +4777,7 @@
168 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
169 *-*-nto*) icu_cv_host_frag=mh-qnx ;;
170 *-ncr-*) icu_cv_host_frag=mh-mpras ;;
171 +*-*-aros) icu_cv_host_frag=mh-aros ;;
172 *) icu_cv_host_frag=mh-unknown ;;
173 esac
174
175 @@ -10237,9 +10235,11 @@
176 fi
177 datapackaging_howfound="$datapackaging_msg_set"
178 ;;
179 -# static)
180 -# DATA_PACKAGING_MODE=static
181 -# ;;
182 + static)
183 + DATA_PACKAGING_MODE=static
184 + datapackaging_msg="ICU data will be stored in a static library."
185 + datapackaging_howfound="$datapackaging_msg_set"
186 + ;;
187 esac
188
189
190 diff -ruN icu/source/data/Makefile.in icu.aros/source/data/Makefile.in
191 --- icu/source/data/Makefile.in 2009-07-01 19:51:20.000000000 +0100
192 +++ icu.aros/source/data/Makefile.in 2013-04-09 21:17:15.023255820 +0100
193 @@ -34,11 +34,14 @@
194 ifeq ($(PKGDATA_MODE),dll)
195 ICUPKGDATA_OUTDIR = $(LIBDIR)
196 else
197 +ifeq ($(PKGDATA_MODE),static)
198 +ICUPKGDATA_OUTDIR = $(LIBDIR)
199 +else
200 ICUPKGDATA_OUTDIR = $(OUTDIR)
201 endif
202 +endif
203
204 -CURDIR:=$(CURR_FULL_DIR)
205 -PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
206 +PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURR_FULL_DIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
207
208 ifeq ($(OS390_STUBDATA),1)
209 OS390PKG=package390
210 @@ -64,24 +67,24 @@
211
212 OUTTMPDIR=$(OUTDIR)/tmp
213 MAINBUILDDIR=$(OUTDIR)/build
214 -BUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
215 +DATABUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
216 UNICODEDATADIR=$(SRCDATADIR)/unidata
217 LOCSRCDIR=$(SRCDATADIR)/locales
218 COLSRCDIR=$(SRCDATADIR)/coll
219 -COLBLDDIR=$(BUILDDIR)/coll
220 +COLBLDDIR=$(DATABUILDDIR)/coll
221 RBNFSRCDIR=$(SRCDATADIR)/rbnf
222 -RBNFBLDDIR=$(BUILDDIR)/rbnf
223 +RBNFBLDDIR=$(DATABUILDDIR)/rbnf
224 TRANSLITSRCDIR=$(SRCDATADIR)/translit
225 -TRANSLITBLDDIR=$(BUILDDIR)/translit
226 +TRANSLITBLDDIR=$(DATABUILDDIR)/translit
227 MISCSRCDIR=$(SRCDATADIR)/misc
228 BRKSRCDIR=$(SRCDATADIR)/brkitr
229 -BRKBLDDIR=$(BUILDDIR)/brkitr
230 +BRKBLDDIR=$(DATABUILDDIR)/brkitr
231 MISCSRCDIR=$(SRCDATADIR)/misc
232 UCMSRCDIR=$(SRCDATADIR)/mappings
233 SPREPSRCDIR=$(SRCDATADIR)/sprep
234 COMINCDIR=$(top_srcdir)/common/unicode
235 SRCLISTDEPS=Makefile $(srcdir)/Makefile.in
236 -BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(BUILDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
237 +BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(DATABUILDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
238
239 # relative lib links from pkgdata are the same as for tmp
240 TOOLDIR=$(top_builddir)/tools
241 @@ -172,11 +175,11 @@
242 endif
243 ifneq ($(ENABLE_STATIC),)
244 ifeq ($(PKGDATA_MODE),dll)
245 - $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
246 + $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(DATABUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
247 endif
248 endif
249 ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
250 - $(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)
251 + $(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)
252 else
253 $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR)
254 endif
255 @@ -187,7 +190,7 @@
256 #### 390 support
257 install390: package390
258 $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
259 - $(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)
260 + $(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)
261 ifeq ($(PKGDATA_MODE),dll)
262 $(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB)
263 endif
264 @@ -195,7 +198,7 @@
265 #### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode
266 package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
267 ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX)
268 - $(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)
269 + $(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)
270 cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO)
271
272
273 @@ -208,7 +211,7 @@
274 # from data build. See Jitterbug 4497. (makedata.mak revision 1.117)
275 #
276 DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu
277 -DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
278 +DAT_FILES=$(DAT_FILES_SHORT:%=$(DATABUILDDIR)/%)
279
280 ## BRK files
281 BREAK_TREE=brkitr
282 @@ -231,7 +234,7 @@
283 ## Confusables (Spoofing) files
284 ALL_CFU_SOURCE=$(UNICODEDATADIR)/confusables.txt $(UNICODEDATADIR)/confusablesWholeScript.txt
285 CFU_FILES_SHORT=confusables.cfu
286 -CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT)
287 +CFU_FILES=$(DATABUILDDIR)/$(CFU_FILES_SHORT)
288
289 ## UCM files
290 -include $(UCMSRCDIR)/ucmcore.mk
291 @@ -240,7 +243,7 @@
292 -include $(UCMSRCDIR)/ucmlocal.mk
293 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)
294 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
295 -CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
296 +CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(DATABUILDDIR)/%.cnv)
297 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
298
299 ## RES files
300 @@ -290,13 +293,13 @@
301 endif
302
303 ALL_RES_SRC= $(RES_SRC) $(TRNS_SOURCE) $(MSC_SOURCE)
304 -RES_FILES = $(ALL_RES_SRC:%.txt=$(BUILDDIR)/%.res)
305 +RES_FILES = $(ALL_RES_SRC:%.txt=$(DATABUILDDIR)/%.res)
306 RES_FILES_SHORT = $(ALL_RES_SRC:%.txt=%.res)
307 PKGDATA_LIST = $(OUTTMPDIR)/icudata.lst
308
309 INDEX_NAME=res_index
310 INDEX_FILE=$(OUTTMPDIR)/$(INDEX_NAME).txt
311 -INDEX_RES_FILE=$(INDEX_FILE:$(OUTTMPDIR)/%.txt=$(BUILDDIR)/%.res)
312 +INDEX_RES_FILE=$(INDEX_FILE:$(OUTTMPDIR)/%.txt=$(DATABUILDDIR)/%.res)
313 INDEX_RES_FILE_SHORT=$(INDEX_FILE:$(OUTTMPDIR)/%.txt=%.res)
314
315 COLLATION_TREE=coll
316 @@ -330,7 +333,7 @@
317 -include $(SPREPSRCDIR)/sprepfiles.mk
318 -include $(SPREPSRCDIR)/spreplocal.mk
319 ALL_SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL)
320 -SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(BUILDDIR)/%.spp)
321 +SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(DATABUILDDIR)/%.spp)
322 SPREP_FILES_SHORT = $(ALL_SPREP_SOURCE:%.txt=%.spp)
323
324 ## All generated files
325 @@ -340,7 +343,7 @@
326 ALL_FILES_LIST = $(DAT_FILES_SHORT) $(CNV_FILES_SHORT) $(BRK_FILES_SHORT) $(CTD_FILES_SHORT) $(RES_FILES_SHORT) $(INDEX_RES_FILE_SHORT) $(COLLATION_FILES_SHORT) $(COLLATION_INDEX_RES_SHORT) $(BRK_RES_FILES_SHORT) $(BRK_RES_INDEX_RES_SHORT) $(RBNF_FILES_SHORT) $(RBNF_INDEX_RES_SHORT) $(TRANSLIT_FILES_SHORT) $(SPREP_FILES_SHORT) $(CFU_FILES_SHORT)
327
328 UNI_CORE_DATA=uprops.icu ucase.icu ubidi.icu unorm.icu
329 -UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(BUILDDIR)/%)
330 +UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(DATABUILDDIR)/%)
331
332 ifneq ($(INCLUDE_UNI_CORE_DATA),)
333 ALL_FILES_LIST+=$(UNI_CORE_DATA)
334 @@ -367,7 +370,7 @@
335 ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
336 @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
337 @-$(RMV) $@
338 - $(INVOKE) $(TOOLBINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) -o $@
339 + $(INVOKE) $(TOOLBINDIR)/icupkg -d $(DATABUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) -o $@
340 else
341 @echo "$@" > $@
342 endif
343 @@ -397,63 +400,63 @@
344 # DAT FILES
345
346 # uprops.icu
347 -$(BUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/genprops$(TOOLEXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu
348 - $(INVOKE) $(TOOLBINDIR)/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
349 - $(INVOKE) $(TOOLBINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
350 +$(DATABUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/genprops$(TOOLEXEEXT) $(DATABUILDDIR)/$(ICUDT)pnames.icu
351 + $(INVOKE) $(TOOLBINDIR)/genprops -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
352 + $(INVOKE) $(TOOLBINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
353
354 # ubidi.icu
355 -$(BUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/genbidi$(TOOLEXEEXT)
356 - $(INVOKE) $(TOOLBINDIR)/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
357 - $(INVOKE) $(TOOLBINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
358 +$(DATABUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/genbidi$(TOOLEXEEXT)
359 + $(INVOKE) $(TOOLBINDIR)/genbidi -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
360 + $(INVOKE) $(TOOLBINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
361
362 # ucase.icu
363 -$(BUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gencase$(TOOLEXEEXT)
364 - $(INVOKE) $(TOOLBINDIR)/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
365 - $(INVOKE) $(TOOLBINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
366 +$(DATABUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gencase$(TOOLEXEEXT)
367 + $(INVOKE) $(TOOLBINDIR)/gencase -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
368 + $(INVOKE) $(TOOLBINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
369
370 # pnames.icu
371 -$(BUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(TOOLBINDIR)/genpname$(TOOLEXEEXT)
372 - $(INVOKE) $(TOOLBINDIR)/genpname -d $(BUILDDIR)
373 +$(DATABUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(TOOLBINDIR)/genpname$(TOOLEXEEXT)
374 + $(INVOKE) $(TOOLBINDIR)/genpname -d $(DATABUILDDIR)
375
376 # unorm.icu
377 -$(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/gennorm$(TOOLEXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu $(BUILDDIR)/$(ICUDT)uprops.icu $(BUILDDIR)/$(ICUDT)ucase.icu
378 - $(INVOKE) $(TOOLBINDIR)/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
379 - $(INVOKE) $(TOOLBINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
380 +$(DATABUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/gennorm$(TOOLEXEEXT) $(DATABUILDDIR)/$(ICUDT)pnames.icu $(DATABUILDDIR)/$(ICUDT)uprops.icu $(DATABUILDDIR)/$(ICUDT)ucase.icu
381 + $(INVOKE) $(TOOLBINDIR)/gennorm -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
382 + $(INVOKE) $(TOOLBINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
383
384 # ucadata.icu
385 -# used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu
386 +# used to depend on $(DATABUILDDIR)/$(ICUDT)unorm.icu $(DATABUILDDIR)/$(ICUDT)ucase.icu
387 # see Jitterbug 4497
388 $(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT)
389 - $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(BUILDDIR)
390 + $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(DATABUILDDIR)
391
392 # unames.icu
393 -$(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gennames$(TOOLEXEEXT)
394 - $(INVOKE) $(TOOLBINDIR)/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
395 +$(DATABUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gennames$(TOOLEXEEXT)
396 + $(INVOKE) $(TOOLBINDIR)/gennames -1 -d $(DATABUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
397
398 # cnvalias.icu
399 -$(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(TOOLBINDIR)/gencnval$(TOOLEXEEXT)
400 - $(INVOKE) $(TOOLBINDIR)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
401 +$(DATABUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(TOOLBINDIR)/gencnval$(TOOLEXEEXT)
402 + $(INVOKE) $(TOOLBINDIR)/gencnval -d $(DATABUILDDIR) $(UCMSRCDIR)/convrtrs.txt
403
404 #################################################### SPP
405 # SPP FILES
406
407 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu
408 - $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
409 +$(DATABUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(DATABUILDDIR)/unames.icu $(DATABUILDDIR)/pnames.icu
410 + $(INVOKE) $(TOOLBINDIR)/gensprep -d $(DATABUILDDIR) -i $(DATABUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
411
412 #################################################### BRK
413 # BRK FILES
414
415 #thaidict.brk: $(SRCDATADIR)/thaidict.brk
416 -# $(RMV) $@ && ln -s $(BUILDDIR) $@
417 +# $(RMV) $@ && ln -s $(DATABUILDDIR) $@
418
419 $(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genbrk$(TOOLEXEEXT) $(DAT_FILES)
420 - $(INVOKE) $(TOOLBINDIR)/genbrk -c -i $(BUILDDIR) -r $< -o $@
421 + $(INVOKE) $(TOOLBINDIR)/genbrk -c -i $(DATABUILDDIR) -r $< -o $@
422
423 #################################################### CTD
424 # CTD FILES
425
426 $(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_FILES)
427 - $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(BUILDDIR) -o $@ $<
428 + $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(DATABUILDDIR) -o $@ $<
429
430 #################################################### CFU
431 # CFU FILES
432 @@ -466,23 +469,23 @@
433 $(INVOKE) echo ALL_CFU_SOURCE: $(ALL_CFU_SOURCE)
434 $(INVOKE) echo CFU_FILES: $(CFU_FILES)
435 $(INVOKE) echo CFU_FILES_SHORT: $(CFU_FILES_SHORT)
436 - $(INVOKE) $(TOOLBINDIR)/gencfu -c -i $(BUILDDIR) -r $(word 1,$(ALL_CFU_SOURCE)) -w $(word 2,$(ALL_CFU_SOURCE)) -o $@
437 + $(INVOKE) $(TOOLBINDIR)/gencfu -c -i $(DATABUILDDIR) -r $(word 1,$(ALL_CFU_SOURCE)) -w $(word 2,$(ALL_CFU_SOURCE)) -o $@
438
439
440 #################################################### CNV
441 # CNV FILES
442 -$(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
443 - $(INVOKE) $(TOOLBINDIR)/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
444 +$(DATABUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
445 + $(INVOKE) $(TOOLBINDIR)/makeconv -c -d $(DATABUILDDIR) $(UCMSRCDIR)/$(<F)
446
447 #################################################### RES
448 # RES FILES
449
450 ### collation res
451 $(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
452 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
453 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
454
455 $(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
456 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
457 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
458
459 $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
460 @echo "generating $@ (list of installed collation locales)"; \
461 @@ -498,10 +501,10 @@
462
463 ### brk res
464 $(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DAT_FILES)
465 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
466 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
467
468 $(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
469 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
470 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
471
472 $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
473 @echo "generating $@ (list of installed break locales)"; \
474 @@ -517,10 +520,10 @@
475
476 ### RBNF res
477 $(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
478 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
479 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
480
481 $(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
482 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
483 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
484
485 $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
486 @echo "generating $@ (list of installed RBNF locales)"; \
487 @@ -536,13 +539,13 @@
488
489 ### TRANSLIT res
490 $(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
491 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
492 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
493
494 ### normal (locale) res
495 all-RES: $(RES_FILES)
496
497 -$(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
498 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
499 +$(DATABUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
500 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LOCSRCDIR) -d $(DATABUILDDIR) $(<F)
501
502 # if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo.txt
503 TZDATA = $(firstword $(wildcard $(top_builddir)/tools/tzcode/tzdata*.tar.gz) $(wildcard $(top_srcdir)/tools/tzcode/tzdata*.tar.gz))
504 @@ -554,9 +557,9 @@
505
506 # Override the normal genrb for zoneinfo.txt to always pull from
507 # icu/source/tools/tzcode/zoneinfo.txt
508 -$(BUILDDIR)/zoneinfo.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
509 +$(DATABUILDDIR)/zoneinfo.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
510 @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
511 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
512 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(ZONEINFO)
513
514 # Create the tzcode tool and zoneinfo.txt as needed.
515 $(ZONEINFO): $(TZDATA)
516 @@ -567,8 +570,8 @@
517 endif
518
519 # zoneinfo has some issues. Ignore some warnings with -q
520 -$(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
521 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
522 +$(DATABUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
523 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -s $(MISCSRCDIR) -d $(DATABUILDDIR) $(<F)
524
525
526
527 @@ -586,10 +589,10 @@
528 echo "}" >> $@;
529
530 clean-resindex:
531 - -$(RMV) $(BUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
532 + -$(RMV) $(DATABUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
533
534 $(INDEX_RES_FILE): $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
535 - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
536 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(INDEX_FILE)
537
538 # Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu)
539 # are hardcoded in the common DLL and therefore not included in the data package any more.
540 @@ -597,7 +600,7 @@
541 # when updating the Unicode data.
542 # Changed in Makefile.in revision 1.147. See Jitterbug 4497.
543 uni-core-data: build-dir $(UNI_CORE_TARGET_DATA)
544 - @echo Unicode .icu files built to $(BUILDDIR)
545 + @echo Unicode .icu files built to $(DATABUILDDIR)
546 @echo Unicode .c source files built to $(OUTTMPDIR)
547
548 build-icu4j: all
549 diff -ruN icu/source/data/Makefile.in.orig icu.aros/source/data/Makefile.in.orig
550 --- icu/source/data/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100
551 +++ icu.aros/source/data/Makefile.in.orig 2013-04-09 21:16:22.756541836 +0100
552 @@ -0,0 +1,638 @@
553 +## Makefile.in for ICU data
554 +## Copyright (c) 1999-2009, International Business Machines Corporation and
555 +## others. All Rights Reserved.
556 +
557 +## Source directory information
558 +srcdir = @srcdir@
559 +top_srcdir = @top_srcdir@
560 +
561 +# So that you have $(top_builddir)/config.status
562 +top_builddir = ..
563 +
564 +## All the flags and other definitions are included here.
565 +include $(top_builddir)/icudefs.mk
566 +
567 +
568 +
569 +## Build directory information
570 +# So that $(top_builddir)/$(subdir) ~= "here"
571 +subdir = data
572 +
573 +#lib icu data for link
574 +LIB_ICUDATA_NAME=$(LIBICU)$(DATA_STUBNAME)$(ICULIBSUFFIX)
575 +LIB_STATIC_ICUDATA_NAME=$(LIBSICU)$(DATA_STUBNAME)$(ICULIBSUFFIX)
576 +
577 +# Allow Windows to override these options
578 +ifeq ($(PKGDATA_OPTS),)
579 +PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc
580 +endif
581 +ifeq ($(PKGDATA_VERSIONING),)
582 +PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION)
583 +endif
584 +
585 +# This allows all the data to be in one directory
586 +ifeq ($(PKGDATA_MODE),dll)
587 +ICUPKGDATA_OUTDIR = $(LIBDIR)
588 +else
589 +ICUPKGDATA_OUTDIR = $(OUTDIR)
590 +endif
591 +
592 +PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURR_FULL_DIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
593 +
594 +ifeq ($(OS390_STUBDATA),1)
595 +OS390PKG=package390
596 +OS390INSTALL=install390
597 +
598 +# Additional data for 390
599 +OS390LIST=$(OUTTMPDIR)/icudata390.lst
600 +OUTTMPDIR_390STUB=$(top_builddir)/data/out/tmp_390stub
601 +endif
602 +
603 +# OBJDATADIR must be a short path (with ..'s) to the data.
604 +
605 +ifeq ($(top_srcdir),..)
606 +SRCDATADIR=.
607 +else
608 +SRCDATADIR=$(top_srcdir)/data
609 +endif
610 +ifeq ($(top_builddir),..)
611 +OUTDIR=./out
612 +else
613 +OUTDIR=$(top_builddir)/data/out
614 +endif
615 +
616 +OUTTMPDIR=$(OUTDIR)/tmp
617 +MAINBUILDDIR=$(OUTDIR)/build
618 +DATABUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
619 +UNICODEDATADIR=$(SRCDATADIR)/unidata
620 +LOCSRCDIR=$(SRCDATADIR)/locales
621 +COLSRCDIR=$(SRCDATADIR)/coll
622 +COLBLDDIR=$(DATABUILDDIR)/coll
623 +RBNFSRCDIR=$(SRCDATADIR)/rbnf
624 +RBNFBLDDIR=$(DATABUILDDIR)/rbnf
625 +TRANSLITSRCDIR=$(SRCDATADIR)/translit
626 +TRANSLITBLDDIR=$(DATABUILDDIR)/translit
627 +MISCSRCDIR=$(SRCDATADIR)/misc
628 +BRKSRCDIR=$(SRCDATADIR)/brkitr
629 +BRKBLDDIR=$(DATABUILDDIR)/brkitr
630 +MISCSRCDIR=$(SRCDATADIR)/misc
631 +UCMSRCDIR=$(SRCDATADIR)/mappings
632 +SPREPSRCDIR=$(SRCDATADIR)/sprep
633 +COMINCDIR=$(top_srcdir)/common/unicode
634 +SRCLISTDEPS=Makefile $(srcdir)/Makefile.in
635 +BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(DATABUILDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
636 +
637 +# relative lib links from pkgdata are the same as for tmp
638 +TOOLDIR=$(top_builddir)/tools
639 +
640 +## List of phony targets
641 +.PHONY : all all-local all-recursive install install-local install-files \
642 +install-recursive clean clean-local clean-recursive distclean \
643 +distclean-local distclean-recursive dist dist-local dist-recursive \
644 +check check-local check-recursive build-local clean-resindex build-dir
645 +
646 +## Clear suffix list
647 +.SUFFIXES :
648 +
649 +## List of standard targets
650 +all: all-local
651 +install: all-local install-local
652 +clean: clean-local
653 +distclean : distclean-local
654 +dist:
655 +check: all
656 +
657 +
658 +distclean-local: clean
659 + $(RMV) Makefile
660 +
661 +all-local: build-dir icupkg.inc build-local packagedata $(POST_DATA_BUILD) $(OS390PKG)
662 +
663 +dist-local:
664 +
665 +clean-map:
666 + -test -z *.map || $(RMV) *.map
667 +
668 +clean-local: cleanpackage cleanfiles clean-map
669 +
670 +cleanfiles:
671 + test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
672 +
673 +cleanpackage:
674 + $(RMV) $(OUTDIR)
675 + $(RMV) $(LIBDIR)/$(LIB_ICUDATA_NAME)*.$(SO)* $(LIBDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
676 +
677 +check-local:
678 +
679 +# Find out if we have a source archive.
680 +# If we have that, then use that instead of building everything from scratch.
681 +ICUDATA_SOURCE_ARCHIVE = $(wildcard $(srcdir)/in/$(ICUDATA_PLATFORM_NAME).dat)
682 +ifeq ($(ICUDATA_SOURCE_ARCHIVE),)
683 +ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/$(ICUDATA_BASENAME_VERSION)*.dat))
684 +# We don't have the data in the current endianess or charset.
685 +# See if we can find data of any archive type,
686 +# and convert it to the current type.
687 +ifneq ($(ICUDATA_ARCHIVE),)
688 +ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
689 +$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
690 + $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
691 +endif
692 +else
693 +ifneq ($(ENABLE_STATIC),YES)
694 +ifeq ($(PKGDATA_MODE),common)
695 +# We have a source data common archive in the native endianess,
696 +# and it's what we want to build. Try to not run any of ICU's tools.
697 +ICUDATA_SOURCE_IS_NATIVE_TARGET=YES
698 +endif
699 +endif
700 +endif
701 +
702 +packagedata: icupkg.inc $(PKGDATA_LIST) build-local
703 +ifneq ($(ENABLE_STATIC),)
704 +ifeq ($(PKGDATA_MODE),dll)
705 + $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_LIST)
706 +endif
707 +endif
708 +ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
709 + $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST)
710 +else
711 + $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR)
712 +endif
713 +
714 +## Install ICU data.
715 +install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
716 + $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
717 +ifeq ($(PKGDATA_MODE),files)
718 + $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)
719 + $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
720 + $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
721 + $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
722 + $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
723 +endif
724 +ifneq ($(ENABLE_STATIC),)
725 +ifeq ($(PKGDATA_MODE),dll)
726 + $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(DATABUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
727 +endif
728 +endif
729 +ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
730 + $(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)
731 +else
732 + $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR)
733 +endif
734 +
735 +
736 +####
737 +####
738 +#### 390 support
739 +install390: package390
740 + $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
741 + $(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)
742 +ifeq ($(PKGDATA_MODE),dll)
743 + $(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB)
744 +endif
745 +
746 +#### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode
747 +package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
748 + ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX)
749 + $(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)
750 + cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO)
751 +
752 +
753 +##### Define all the data files. the build rule that depends on them is below.
754 +# X_FILES_SHORT = just the base names (for lists)
755 +# X_FILES = full paths (for dependency)
756 +
757 +## DAT files - Misc. data files.
758 +# 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu)
759 +# from data build. See Jitterbug 4497. (makedata.mak revision 1.117)
760 +#
761 +DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu
762 +DAT_FILES=$(DAT_FILES_SHORT:%=$(DATABUILDDIR)/%)
763 +
764 +## BRK files
765 +BREAK_TREE=brkitr
766 +-include $(BRKSRCDIR)/brkfiles.mk
767 +-include $(BRKSRCDIR)/brklocal.mk
768 +ALL_BRK_SOURCE= $(BRK_SOURCE) $(BRK_SOURCE_LOCAL)
769 +BRK_FILES_SHORT=$(ALL_BRK_SOURCE:%.txt=$(BREAK_TREE)/%.brk)
770 +BRK_FILES=$(ALL_BRK_SOURCE:%.txt=$(BRKBLDDIR)/%.brk)
771 +ifdef BRK_CTD_SOURCE
772 +ALL_CTD_SOURCE=$(BRK_CTD_SOURCE) $(BRK_CTD_SOURCE_LOCAL)
773 +CTD_FILES_SHORT=$(ALL_CTD_SOURCE:%.txt=$(BREAK_TREE)/%.ctd)
774 +CTD_FILES=$(ALL_CTD_SOURCE:%.txt=$(BRKBLDDIR)/%.ctd)
775 +endif
776 +ifdef BRK_RES_SOURCE
777 +BRS_SRC= root.txt $(BRK_RES_SOURCE) $(BRK_RES_SOURCE_LOCAL)
778 +BRS_SRC_FILES = $(BRS_SRC:%=$(BRKSRCDIR)/%)
779 +INSTALLED_BRS_FILES = $(BRK_RES_SOURCE:%.txt=%) $(BRK_RES_SOURCE_LOCAL:%.txt=%)
780 +endif
781 +
782 +## Confusables (Spoofing) files
783 +ALL_CFU_SOURCE=$(UNICODEDATADIR)/confusables.txt $(UNICODEDATADIR)/confusablesWholeScript.txt
784 +CFU_FILES_SHORT=confusables.cfu
785 +CFU_FILES=$(DATABUILDDIR)/$(CFU_FILES_SHORT)
786 +
787 +## UCM files
788 +-include $(UCMSRCDIR)/ucmcore.mk
789 +-include $(UCMSRCDIR)/ucmfiles.mk
790 +-include $(UCMSRCDIR)/ucmebcdic.mk
791 +-include $(UCMSRCDIR)/ucmlocal.mk
792 +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)
793 +UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
794 +CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(DATABUILDDIR)/%.cnv)
795 +CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
796 +
797 +## RES files
798 +-include $(LOCSRCDIR)/resfiles.mk
799 +-include $(COLSRCDIR)/colfiles.mk
800 +-include $(RBNFSRCDIR)/rbnffiles.mk
801 +-include $(TRANSLITSRCDIR)/trnsfiles.mk
802 +-include $(LOCSRCDIR)/reslocal.mk
803 +-include $(COLSRCDIR)/collocal.mk
804 +-include $(BRKSRCDIR)/brslocal.mk
805 +-include $(RBNFSRCDIR)/rbnflocal.mk
806 +-include $(TRANSLITSRCDIR)/trnslocal.mk
807 +ifdef GENRB_SOURCE
808 +RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $(GENRB_ALIAS_SOURCE_LOCAL)
809 +RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%)
810 +INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%)
811 +endif
812 +ifdef COLLATION_SOURCE
813 +COL_SRC= root.txt $(COLLATION_SOURCE) $(COLLATION_ALIAS_SOURCE) $(COLLATION_SOURCE_LOCAL)
814 +COL_SRC_FILES = $(COL_SRC:%=$(COLSRCDIR)/%)
815 +INSTALLED_COL_FILES = $(COLLATION_SOURCE:%.txt=%) $(COLLATION_SOURCE_LOCAL:%.txt=%)
816 +endif
817 +ifdef RBNF_SOURCE
818 +RBNF_SRC= root.txt $(RBNF_SOURCE) $(RBNF_ALIAS_SOURCE) $(RBNF_SOURCE_LOCAL)
819 +RBNF_SRC_FILES = $(RBNF_SRC:%=$(RBNFSRCDIR)/%)
820 +INSTALLED_RBNF_FILES = $(RBNF_SOURCE:%.txt=%) $(RBNF_SOURCE_LOCAL:%.txt=%)
821 +endif
822 +ifdef TRANSLIT_SOURCE
823 +TRANSLIT_SRC= $(TRANSLIT_SOURCE) $(TRANSLIT_ALIAS_SOURCE) $(TRANSLIT_SOURCE_LOCAL)
824 +TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%)
825 +INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:%.txt=%)
826 +endif
827 +GENRBOPTS=-k
828 +
829 +## MISC files
830 +-include $(MISCSRCDIR)/miscfiles.mk
831 +-include $(MISCSRCDIR)/misclocal.mk
832 +MSC_SOURCE= $(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
833 +MSC_SRC_FILES=$(MSC_SOURCE:%=$(MISCSRCDIR)/%)
834 +
835 +ifeq ($(ENABLE_SO_VERSION_DATA),1)
836 +ifeq ($(PKGDATA_MODE),dll)
837 +SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
838 +$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
839 + rc.exe /i$(srcdir)/../common /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
840 +endif
841 +endif
842 +
843 +ALL_RES_SRC= $(RES_SRC) $(TRNS_SOURCE) $(MSC_SOURCE)
844 +RES_FILES = $(ALL_RES_SRC:%.txt=$(DATABUILDDIR)/%.res)
845 +RES_FILES_SHORT = $(ALL_RES_SRC:%.txt=%.res)
846 +PKGDATA_LIST = $(OUTTMPDIR)/icudata.lst
847 +
848 +INDEX_NAME=res_index
849 +INDEX_FILE=$(OUTTMPDIR)/$(INDEX_NAME).txt
850 +INDEX_RES_FILE=$(INDEX_FILE:$(OUTTMPDIR)/%.txt=$(DATABUILDDIR)/%.res)
851 +INDEX_RES_FILE_SHORT=$(INDEX_FILE:$(OUTTMPDIR)/%.txt=%.res)
852 +
853 +COLLATION_TREE=coll
854 +COLLATION_INDEX_FILE=$(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt
855 +COLLATION_INDEX_RES=$(COLBLDDIR)/$(INDEX_NAME).res
856 +COLLATION_INDEX_RES_SHORT=$(COLLATION_TREE)/$(INDEX_NAME).res
857 +COLLATION_FILES = $(COL_SRC:%.txt=$(COLBLDDIR)/%.res) $(COLLATION_INDEX_RES)
858 +COLLATION_FILES_SHORT = $(COL_SRC:%.txt=$(COLLATION_TREE)/%.res)
859 +
860 +BRK_RES_INDEX_FILE=$(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt
861 +BRK_RES_INDEX_RES=$(BRKBLDDIR)/$(INDEX_NAME).res
862 +BRK_RES_INDEX_RES_SHORT=$(BREAK_TREE)/$(INDEX_NAME).res
863 +BRK_RES_FILES = $(BRS_SRC:%.txt=$(BRKBLDDIR)/%.res) $(BRK_RES_INDEX_RES)
864 +BRK_RES_FILES_SHORT = $(BRS_SRC:%.txt=$(BREAK_TREE)/%.res)
865 +
866 +RBNF_TREE=rbnf
867 +RBNF_INDEX_FILE=$(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt
868 +RBNF_INDEX_RES=$(RBNFBLDDIR)/$(INDEX_NAME).res
869 +RBNF_INDEX_RES_SHORT=$(RBNF_TREE)/$(INDEX_NAME).res
870 +RBNF_FILES = $(RBNF_SRC:%.txt=$(RBNFBLDDIR)/%.res) $(RBNF_INDEX_RES)
871 +RBNF_FILES_SHORT = $(RBNF_SRC:%.txt=$(RBNF_TREE)/%.res)
872 +
873 +TRANSLIT_TREE=translit
874 +#TRANSLIT_INDEX_FILE=$(OUTTMPDIR)/$(TRANSLIT_TREE)/$(INDEX_NAME).txt
875 +#TRANSLIT_INDEX_RES=$(TRANSLITBLDDIR)/$(INDEX_NAME).res
876 +#TRANSLIT_INDEX_RES_SHORT=$(TRANSLIT_TREE)/$(INDEX_NAME).res
877 +TRANSLIT_FILES = $(TRANSLIT_SRC:%.txt=$(TRANSLITBLDDIR)/%.res)
878 +TRANSLIT_FILES_SHORT = $(TRANSLIT_SRC:%.txt=$(TRANSLIT_TREE)/%.res)
879 +
880 +## SPP files
881 +-include $(SPREPSRCDIR)/sprepfiles.mk
882 +-include $(SPREPSRCDIR)/spreplocal.mk
883 +ALL_SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL)
884 +SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(DATABUILDDIR)/%.spp)
885 +SPREP_FILES_SHORT = $(ALL_SPREP_SOURCE:%.txt=%.spp)
886 +
887 +## All generated files
888 +ALL_FILES = $(DAT_FILES) $(CNV_FILES) $(BRK_FILES) $(CTD_FILES) $(RES_FILES) $(INDEX_RES_FILE) $(COLLATION_FILES) $(BRK_RES_FILES) $(RBNF_FILES) $(TRANSLIT_FILES) $(SPREP_FILES) $(CFU_FILES)
889 +ALL_INDEX_SRC_FILES = $(PKGDATA_LIST) $(INDEX_FILE) $(COLLATION_INDEX_FILE) $(BRK_RES_INDEX_FILE) $(RBNF_INDEX_FILE)
890 +# a list to use in the .lst files (package-relative)
891 +ALL_FILES_LIST = $(DAT_FILES_SHORT) $(CNV_FILES_SHORT) $(BRK_FILES_SHORT) $(CTD_FILES_SHORT) $(RES_FILES_SHORT) $(INDEX_RES_FILE_SHORT) $(COLLATION_FILES_SHORT) $(COLLATION_INDEX_RES_SHORT) $(BRK_RES_FILES_SHORT) $(BRK_RES_INDEX_RES_SHORT) $(RBNF_FILES_SHORT) $(RBNF_INDEX_RES_SHORT) $(TRANSLIT_FILES_SHORT) $(SPREP_FILES_SHORT) $(CFU_FILES_SHORT)
892 +
893 +UNI_CORE_DATA=uprops.icu ucase.icu ubidi.icu unorm.icu
894 +UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(DATABUILDDIR)/%)
895 +
896 +ifneq ($(INCLUDE_UNI_CORE_DATA),)
897 +ALL_FILES_LIST+=$(UNI_CORE_DATA)
898 +build-local: uni-core-data
899 +endif
900 +
901 +#####################################################
902 +# General data build rules
903 +
904 +## Files to remove for 'make clean'
905 +CLEANFILES = *~ icupkg.inc
906 +
907 +ifeq ($(ICUDATA_SOURCE_ARCHIVE),)
908 +build-local: build-dir $(SO_VERSION_DATA) $(ALL_FILES) $(PKGDATA_LIST) $(OS390LIST)
909 +$(PKGDATA_LIST): $(SRCLISTDEPS)
910 + @echo "generating $@ (list of data files)"
911 + @-$(RMV) $@
912 + @for file in $(ALL_FILES_LIST); do \
913 + echo $$file >> $@; \
914 + done;
915 +else
916 +build-local: build-dir $(SO_VERSION_DATA) $(PKGDATA_LIST) $(OS390LIST)
917 +$(PKGDATA_LIST): $(SRCLISTDEPS) $(ICUDATA_SOURCE_ARCHIVE)
918 +ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
919 + @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
920 + @-$(RMV) $@
921 + $(INVOKE) $(TOOLBINDIR)/icupkg -d $(DATABUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) -o $@
922 +else
923 + @echo "$@" > $@
924 +endif
925 +endif
926 +
927 +
928 +$(BUILD_DIRS): build-dir
929 +
930 +build-dir:
931 + @list='$(BUILD_DIRS)'; \
932 + for dir in $$list; do \
933 + if ! test -d $$dir; then \
934 + echo $(MKINSTALLDIRS) $(BUILD_DIRS); \
935 + $(MKINSTALLDIRS) $(BUILD_DIRS); \
936 + fi; \
937 + done
938 +
939 +# The | is an order-only prerequisite. This helps when the -j option is used,
940 +# and we don't want the files to be built before the directories are built.
941 +ifneq ($(filter order-only,$(.FEATURES)),)
942 +$(ALL_FILES) $(ALL_INDEX_SRC_FILES): | build-dir
943 +endif
944 +
945 +# Now, sections for building each kind of data.
946 +
947 +#################################################### DAT
948 +# DAT FILES
949 +
950 +# uprops.icu
951 +$(DATABUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/genprops$(TOOLEXEEXT) $(DATABUILDDIR)/$(ICUDT)pnames.icu
952 + $(INVOKE) $(TOOLBINDIR)/genprops -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
953 + $(INVOKE) $(TOOLBINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
954 +
955 +# ubidi.icu
956 +$(DATABUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/genbidi$(TOOLEXEEXT)
957 + $(INVOKE) $(TOOLBINDIR)/genbidi -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
958 + $(INVOKE) $(TOOLBINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
959 +
960 +# ucase.icu
961 +$(DATABUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gencase$(TOOLEXEEXT)
962 + $(INVOKE) $(TOOLBINDIR)/gencase -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
963 + $(INVOKE) $(TOOLBINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
964 +
965 +# pnames.icu
966 +$(DATABUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(TOOLBINDIR)/genpname$(TOOLEXEEXT)
967 + $(INVOKE) $(TOOLBINDIR)/genpname -d $(DATABUILDDIR)
968 +
969 +# unorm.icu
970 +$(DATABUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLBINDIR)/gennorm$(TOOLEXEEXT) $(DATABUILDDIR)/$(ICUDT)pnames.icu $(DATABUILDDIR)/$(ICUDT)uprops.icu $(DATABUILDDIR)/$(ICUDT)ucase.icu
971 + $(INVOKE) $(TOOLBINDIR)/gennorm -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(DATABUILDDIR) -u $(UNICODE_VERSION)
972 + $(INVOKE) $(TOOLBINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(DATABUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
973 +
974 +# ucadata.icu
975 +# used to depend on $(DATABUILDDIR)/$(ICUDT)unorm.icu $(DATABUILDDIR)/$(ICUDT)ucase.icu
976 +# see Jitterbug 4497
977 +$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLBINDIR)/genuca$(TOOLEXEEXT)
978 + $(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(DATABUILDDIR)
979 +
980 +# unames.icu
981 +$(DATABUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLBINDIR)/gennames$(TOOLEXEEXT)
982 + $(INVOKE) $(TOOLBINDIR)/gennames -1 -d $(DATABUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
983 +
984 +# cnvalias.icu
985 +$(DATABUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(TOOLBINDIR)/gencnval$(TOOLEXEEXT)
986 + $(INVOKE) $(TOOLBINDIR)/gencnval -d $(DATABUILDDIR) $(UCMSRCDIR)/convrtrs.txt
987 +
988 +#################################################### SPP
989 +# SPP FILES
990 +
991 +$(DATABUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(DATABUILDDIR)/unames.icu $(DATABUILDDIR)/pnames.icu
992 + $(INVOKE) $(TOOLBINDIR)/gensprep -d $(DATABUILDDIR) -i $(DATABUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
993 +
994 +#################################################### BRK
995 +# BRK FILES
996 +
997 +#thaidict.brk: $(SRCDATADIR)/thaidict.brk
998 +# $(RMV) $@ && ln -s $(DATABUILDDIR) $@
999 +
1000 +$(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genbrk$(TOOLEXEEXT) $(DAT_FILES)
1001 + $(INVOKE) $(TOOLBINDIR)/genbrk -c -i $(DATABUILDDIR) -r $< -o $@
1002 +
1003 +#################################################### CTD
1004 +# CTD FILES
1005 +
1006 +$(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_FILES)
1007 + $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(DATABUILDDIR) -o $@ $<
1008 +
1009 +#################################################### CFU
1010 +# CFU FILES
1011 +# Note: gencfu requires two input files to produce a single output file.
1012 +# There will be exactly one target file and two source files.
1013 +# The $(word n, ...) selects the nth word from the following stuff.
1014 +# There must be a nicer way to do this.
1015 +
1016 +$(CFU_FILES): $(ALL_CFU_SOURCE) $(TOOLBINDIR)/gencfu$(EXEEXT) $(DAT_FILES)
1017 + $(INVOKE) echo ALL_CFU_SOURCE: $(ALL_CFU_SOURCE)
1018 + $(INVOKE) echo CFU_FILES: $(CFU_FILES)
1019 + $(INVOKE) echo CFU_FILES_SHORT: $(CFU_FILES_SHORT)
1020 + $(INVOKE) $(TOOLBINDIR)/gencfu -c -i $(DATABUILDDIR) -r $(word 1,$(ALL_CFU_SOURCE)) -w $(word 2,$(ALL_CFU_SOURCE)) -o $@
1021 +
1022 +
1023 +#################################################### CNV
1024 +# CNV FILES
1025 +$(DATABUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(TOOLBINDIR)/makeconv$(TOOLEXEEXT)
1026 + $(INVOKE) $(TOOLBINDIR)/makeconv -c -d $(DATABUILDDIR) $(UCMSRCDIR)/$(<F)
1027 +
1028 +#################################################### RES
1029 +# RES FILES
1030 +
1031 +### collation res
1032 +$(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
1033 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
1034 +
1035 +$(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1036 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
1037 +
1038 +$(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
1039 + @echo "generating $@ (list of installed collation locales)"; \
1040 + $(RMV) $@; \
1041 + echo "// Warning this file is automatically generated" > $@; \
1042 + echo "$(INDEX_NAME):table(nofallback) {" >> $@; \
1043 + echo " InstalledLocales {" >> $@; \
1044 + for file in $(INSTALLED_COL_FILES); do \
1045 + echo " $$file {\"\"}" >> $@; \
1046 + done; \
1047 + echo " }" >> $@; \
1048 + echo "}" >> $@;
1049 +
1050 +### brk res
1051 +$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(BRK_FILES) $(DAT_FILES)
1052 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
1053 +
1054 +$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1055 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
1056 +
1057 +$(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
1058 + @echo "generating $@ (list of installed break locales)"; \
1059 + $(RMV) $@; \
1060 + echo "// Warning this file is automatically generated" > $@; \
1061 + echo "$(INDEX_NAME):table(nofallback) {" >> $@; \
1062 + echo " InstalledLocales {" >> $@; \
1063 + for file in $(INSTALLED_BRS_FILES); do \
1064 + echo " $$file {\"\"}" >> $@; \
1065 + done; \
1066 + echo " }" >> $@; \
1067 + echo "}" >> $@;
1068 +
1069 +### RBNF res
1070 +$(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
1071 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
1072 +
1073 +$(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1074 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
1075 +
1076 +$(RBNF_INDEX_FILE): $(SRCLISTDEPS)
1077 + @echo "generating $@ (list of installed RBNF locales)"; \
1078 + $(RMV) $@; \
1079 + echo "// Warning this file is automatically generated" > $@; \
1080 + echo "$(INDEX_NAME):table(nofallback) {" >> $@; \
1081 + echo " InstalledLocales {" >> $@; \
1082 + for file in $(INSTALLED_RBNF_FILES); do \
1083 + echo " $$file {\"\"}" >> $@; \
1084 + done; \
1085 + echo " }" >> $@; \
1086 + echo "}" >> $@;
1087 +
1088 +### TRANSLIT res
1089 +$(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
1090 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
1091 +
1092 +### normal (locale) res
1093 +all-RES: $(RES_FILES)
1094 +
1095 +$(DATABUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES)
1096 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -s $(LOCSRCDIR) -d $(DATABUILDDIR) $(<F)
1097 +
1098 +# if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo.txt
1099 +TZDATA = $(firstword $(wildcard $(top_builddir)/tools/tzcode/tzdata*.tar.gz) $(wildcard $(top_srcdir)/tools/tzcode/tzdata*.tar.gz))
1100 +
1101 +ifneq ($(TZDATA),)
1102 +
1103 +TZCODE_DIR=$(top_builddir)/tools/tzcode
1104 +ZONEINFO=$(TZCODE_DIR)/zoneinfo.txt
1105 +
1106 +# Override the normal genrb for zoneinfo.txt to always pull from
1107 +# icu/source/tools/tzcode/zoneinfo.txt
1108 +$(DATABUILDDIR)/zoneinfo.res: $(ZONEINFO) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1109 + @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
1110 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(ZONEINFO)
1111 +
1112 +# Create the tzcode tool and zoneinfo.txt as needed.
1113 +$(ZONEINFO): $(TZDATA)
1114 + @echo "$(MAKE)[$(MAKELEVEL)]: Making \`$(ZONEINFO)' in \`$(TZCODE_DIR)'"; \
1115 + (cd $(TZCODE_DIR) && $(MAKE)) || exit; \
1116 +
1117 +# end of zoneinfo.txt-generation
1118 +endif
1119 +
1120 +# zoneinfo has some issues. Ignore some warnings with -q
1121 +$(DATABUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1122 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -q -i $(DATABUILDDIR) -s $(MISCSRCDIR) -d $(DATABUILDDIR) $(<F)
1123 +
1124 +
1125 +
1126 +$(INDEX_FILE): $(SRCLISTDEPS)
1127 + @echo "generating $@ (list of installed locales)"; \
1128 + $(RMV) $@; \
1129 + echo "// Warning this file is automatically generated" > $@; \
1130 + echo "$(INDEX_NAME):table(nofallback) {" >> $@; \
1131 + echo " CLDRVersion { \"$(GENRB_CLDR_VERSION)\" }" >> $@; \
1132 + echo " InstalledLocales {" >> $@; \
1133 + for file in $(INSTALLED_RB_FILES); do \
1134 + echo " $$file {\"\"}" >> $@; \
1135 + done; \
1136 + echo " }" >> $@; \
1137 + echo "}" >> $@;
1138 +
1139 +clean-resindex:
1140 + -$(RMV) $(DATABUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
1141 +
1142 +$(INDEX_RES_FILE): $(INDEX_FILE) $(TOOLBINDIR)/genrb$(TOOLEXEEXT)
1143 + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(DATABUILDDIR) -d $(DATABUILDDIR) $(INDEX_FILE)
1144 +
1145 +# Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu)
1146 +# are hardcoded in the common DLL and therefore not included in the data package any more.
1147 +# They are not built by default but need to be built for ICU4J data and for getting the .c source files
1148 +# when updating the Unicode data.
1149 +# Changed in Makefile.in revision 1.147. See Jitterbug 4497.
1150 +uni-core-data: build-dir $(UNI_CORE_TARGET_DATA)
1151 + @echo Unicode .icu files built to $(DATABUILDDIR)
1152 + @echo Unicode .c source files built to $(OUTTMPDIR)
1153 +
1154 +build-icu4j: all
1155 + $(MAKE) -C ../tools/genrb $@
1156 +
1157 +###################################################################
1158 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1159 + cd $(top_builddir) \
1160 + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1161 +
1162 +icupkg.inc: pkgdataMakefile
1163 + $(MAKE) -f pkgdataMakefile
1164 +
1165 +pkgdataMakefile:
1166 + cd $(top_builddir) \
1167 + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1168 +
1169 +###########
1170 +########### 390 (z/OS) support
1171 +UCMFILES390=ebcdic-xml-us.ucm ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm ibm-4909_P100-1999.ucm
1172 +# used to depend on uprops.icu ucase.icu ubidi.icu unorm.icu
1173 +# see Jitterbug 4497
1174 +ALLFILES390=pnames.icu cnvalias.icu $(UCMFILES390:.ucm=.cnv)
1175 +
1176 +$(OUTTMPDIR)/icudata390.lst: $(SRCLISTDEPS)
1177 + @echo "generating $@ (list of 390 data files)"
1178 + @-$(RMV) $@
1179 + @for file in $(ALLFILES390); do \
1180 + echo $$file >> $@; \
1181 + done;
1182 +
1183 +ifeq ($(POST_DATA_BUILD), os400-data-rebind)
1184 +os400-data-rebind: $(LIBICUUC)
1185 +
1186 +$(LIBICUUC): $(LIBICUDT)
1187 + $(RMV) $(LIBICUUC)
1188 + (cd ../common && $(MAKE) RECURSIVE=YES) || exit;
1189 +endif
1190 +
1191 diff -ruN icu/source/extra/uconv/Makefile.in icu.aros/source/extra/uconv/Makefile.in
1192 --- icu/source/extra/uconv/Makefile.in 2009-07-01 19:50:32.000000000 +0100
1193 +++ icu.aros/source/extra/uconv/Makefile.in 2013-04-09 21:17:15.023255820 +0100
1194 @@ -150,7 +150,7 @@
1195 package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
1196 $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
1197
1198 -$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
1199 +$(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk $(RESFILES)
1200 @$(MKINSTALLDIRS) $(RESDIR)
1201 @-$(RMV) $@
1202 @for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \
1203 diff -ruN icu/source/i18n/Makefile.in icu.aros/source/i18n/Makefile.in
1204 --- icu/source/i18n/Makefile.in 2009-07-01 19:50:12.000000000 +0100
1205 +++ icu.aros/source/i18n/Makefile.in 2013-04-09 21:16:29.017627402 +0100
1206 @@ -27,7 +27,7 @@
1207 TARGET_STUBNAME=$(I18N_STUBNAME)
1208
1209 ifneq ($(ENABLE_STATIC),)
1210 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1211 +I18NTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1212 endif
1213
1214 ifneq ($(ENABLE_SHARED),)
1215 @@ -45,7 +45,7 @@
1216
1217 endif # ENABLE_SHARED
1218
1219 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1220 +ALL_TARGETS = $(I18NTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1221
1222 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1223 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1224 @@ -116,7 +116,7 @@
1225 install-library: all-local
1226 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1227 ifneq ($(ENABLE_STATIC),)
1228 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1229 + $(INSTALL-L) $(I18NTARGET) $(DESTDIR)$(libdir)
1230 endif
1231 ifneq ($(ENABLE_SHARED),)
1232 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1233 @@ -160,7 +160,7 @@
1234 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1235
1236 ifneq ($(ENABLE_STATIC),)
1237 -$(TARGET): $(STATIC_OBJECTS)
1238 +$(I18NTARGET): $(STATIC_OBJECTS)
1239 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1240 $(RANLIB) $@
1241 endif
1242 diff -ruN icu/source/icudefs.mk.in icu.aros/source/icudefs.mk.in
1243 --- icu/source/icudefs.mk.in 2009-07-01 19:51:26.000000000 +0100
1244 +++ icu.aros/source/icudefs.mk.in 2013-04-09 21:17:15.024255833 +0100
1245 @@ -64,10 +64,16 @@
1246 PKGDATA_LIBNAME = -L $(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
1247 ICUPKGDATA_DIR = $(libdir)
1248 else
1249 +ifeq ($(PKGDATA_MODE),static)
1250 +ICUDATA_NAME = $(ICUDATA_PLATFORM_NAME)
1251 +PKGDATA_LIBNAME = -L $(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
1252 +ICUPKGDATA_DIR = $(libdir)
1253 +else
1254 ICUDATA_NAME = $(ICUDATA_PLATFORM_NAME)
1255 ICUPKGDATA_DIR = $(ICUDATA_DIR)
1256 endif
1257 endif
1258 +endif
1259 # This is needed so that make -j2 doesn't complain when invoking pkgdata's make
1260 PKGDATA_INVOKE_OPTS = MAKEFLAGS=
1261
1262 diff -ruN icu/source/io/Makefile.in icu.aros/source/io/Makefile.in
1263 --- icu/source/io/Makefile.in 2009-07-01 19:50:48.000000000 +0100
1264 +++ icu.aros/source/io/Makefile.in 2013-04-09 21:16:30.012640999 +0100
1265 @@ -27,7 +27,7 @@
1266 TARGET_STUBNAME=$(IO_STUBNAME)
1267
1268 ifneq ($(ENABLE_STATIC),)
1269 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1270 +IOTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1271 endif
1272
1273 ifneq ($(ENABLE_SHARED),)
1274 @@ -45,7 +45,7 @@
1275
1276 endif # ENABLE_SHARED
1277
1278 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1279 +ALL_TARGETS = $(IOTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1280
1281 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1282 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1283 @@ -97,7 +97,7 @@
1284 install-library: all-local
1285 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1286 ifneq ($(ENABLE_STATIC),)
1287 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1288 + $(INSTALL-L) $(IOTARGET) $(DESTDIR)$(libdir)
1289 endif
1290 ifneq ($(ENABLE_SHARED),)
1291 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1292 @@ -141,7 +141,7 @@
1293 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1294
1295 ifneq ($(ENABLE_STATIC),)
1296 -$(TARGET): $(STATIC_OBJECTS)
1297 +$(IOTARGET): $(STATIC_OBJECTS)
1298 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1299 $(RANLIB) $@
1300 endif
1301 diff -ruN icu/source/layout/Makefile.in icu.aros/source/layout/Makefile.in
1302 --- icu/source/layout/Makefile.in 2009-07-01 19:51:24.000000000 +0100
1303 +++ icu.aros/source/layout/Makefile.in 2013-04-09 21:16:30.373645931 +0100
1304 @@ -26,7 +26,7 @@
1305 TARGET_STUBNAME=$(LAYOUT_STUBNAME)
1306
1307 ifneq ($(ENABLE_STATIC),)
1308 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1309 +LAYOUTTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1310 endif
1311
1312 ifneq ($(ENABLE_SHARED),)
1313 @@ -44,7 +44,7 @@
1314
1315 endif # ENABLE_SHARED
1316
1317 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1318 +ALL_TARGETS = $(LAYOUTTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1319
1320 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1321 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1322 @@ -167,7 +167,7 @@
1323 install-library: all-local
1324 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1325 ifneq ($(ENABLE_STATIC),)
1326 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1327 + $(INSTALL-L) $(LAYOUTTARGET) $(DESTDIR)$(libdir)
1328 endif
1329 ifneq ($(ENABLE_SHARED),)
1330 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1331 @@ -211,7 +211,7 @@
1332 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1333
1334 ifneq ($(ENABLE_STATIC),)
1335 -$(TARGET): $(STATIC_OBJECTS)
1336 +$(LAYOUTTARGET): $(STATIC_OBJECTS)
1337 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1338 $(RANLIB) $@
1339 endif
1340 diff -ruN icu/source/layoutex/Makefile.in icu.aros/source/layoutex/Makefile.in
1341 --- icu/source/layoutex/Makefile.in 2009-07-01 19:51:20.000000000 +0100
1342 +++ icu.aros/source/layoutex/Makefile.in 2013-04-09 21:16:30.537648173 +0100
1343 @@ -26,7 +26,7 @@
1344 TARGET_STUBNAME=$(LAYOUTEX_STUBNAME)
1345
1346 ifneq ($(ENABLE_STATIC),)
1347 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1348 +LAYEXTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1349 endif
1350
1351 ifneq ($(ENABLE_SHARED),)
1352 @@ -44,7 +44,7 @@
1353
1354 endif # ENABLE_SHARED
1355
1356 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1357 +ALL_TARGETS = $(LAYEXTARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET)
1358
1359 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1360 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1361 @@ -98,7 +98,7 @@
1362 install-library: all-local
1363 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1364 ifneq ($(ENABLE_STATIC),)
1365 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1366 + $(INSTALL-L) $(LAYEXTARGET) $(DESTDIR)$(libdir)
1367 endif
1368 ifneq ($(ENABLE_SHARED),)
1369 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1370 @@ -142,7 +142,7 @@
1371 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1372
1373 ifneq ($(ENABLE_STATIC),)
1374 -$(TARGET): $(STATIC_OBJECTS)
1375 +$(LAYEXTARGET): $(STATIC_OBJECTS)
1376 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1377 $(RANLIB) $@
1378 endif
1379 diff -ruN icu/source/stubdata/Makefile.in icu.aros/source/stubdata/Makefile.in
1380 --- icu/source/stubdata/Makefile.in 2009-07-01 19:50:48.000000000 +0100
1381 +++ icu.aros/source/stubdata/Makefile.in 2013-04-09 21:16:31.453660690 +0100
1382 @@ -27,7 +27,7 @@
1383 TARGET_STUBNAME=$(DATA_STUBNAME)
1384
1385 ifneq ($(ENABLE_STATIC),)
1386 -TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1387 +STUBTARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1388 endif
1389
1390
1391 @@ -37,7 +37,7 @@
1392 endif
1393
1394
1395 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
1396 +ALL_TARGETS = $(STUBTARGET) $(ALL_SO_TARGETS)
1397
1398 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1399 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1400 @@ -83,7 +83,7 @@
1401 install-library: all-local
1402 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
1403 ifneq ($(ENABLE_STATIC),)
1404 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
1405 + $(INSTALL-L) $(STUBTARGET) $(DESTDIR)$(libdir)
1406 endif
1407 ifneq ($(ENABLE_SHARED),)
1408 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
1409 @@ -124,7 +124,7 @@
1410 && CONFIG_FILES=common/unicode/platform.h CONFIG_HEADERS= $(SHELL) ./config.status
1411
1412 ifneq ($(ENABLE_STATIC),)
1413 -$(TARGET): $(STATIC_OBJECTS)
1414 +$(STUBTARGET): $(STATIC_OBJECTS)
1415 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1416 $(RANLIB) $@
1417 endif
1418 diff -ruN icu/source/tools/ctestfw/Makefile.in icu.aros/source/tools/ctestfw/Makefile.in
1419 --- icu/source/tools/ctestfw/Makefile.in 2009-07-01 19:50:38.000000000 +0100
1420 +++ icu.aros/source/tools/ctestfw/Makefile.in 2013-04-09 21:16:36.662731868 +0100
1421 @@ -27,7 +27,7 @@
1422 TARGET_STUBNAME=$(CTESTFW_STUBNAME)
1423
1424 ifneq ($(ENABLE_STATIC),)
1425 -TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1426 +CTFWTARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
1427 endif
1428
1429 ifneq ($(ENABLE_SHARED),)
1430 @@ -35,7 +35,7 @@
1431 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
1432 endif
1433
1434 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
1435 +ALL_TARGETS = $(CTFWTARGET) $(ALL_SO_TARGETS)
1436
1437 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
1438 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
1439 @@ -96,7 +96,7 @@
1440 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1441
1442 ifneq ($(ENABLE_STATIC),)
1443 -$(TARGET): $(STATIC_OBJECTS)
1444 +$(CTFWTARGET): $(STATIC_OBJECTS)
1445 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
1446 $(RANLIB) $@
1447 endif
1448 diff -ruN icu/source/tools/dumpce/Makefile.in icu.aros/source/tools/dumpce/Makefile.in
1449 --- icu/source/tools/dumpce/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1450 +++ icu.aros/source/tools/dumpce/Makefile.in 2013-04-09 21:16:36.735732864 +0100
1451 @@ -17,7 +17,7 @@
1452 CLEANFILES = *~ $(DEPS)
1453
1454 ## Target information
1455 -TARGET = dumpce
1456 +DCETARGET = dumpce
1457
1458 CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil
1459 LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
1460 @@ -41,7 +41,7 @@
1461 dist: dist-local
1462 check: all check-local
1463
1464 -all-local: $(TARGET)
1465 +all-local: $(DCETARGET)
1466
1467 install-local:
1468
1469 @@ -49,7 +49,7 @@
1470
1471 clean-local:
1472 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1473 - $(RMV) $(OBJECTS) $(TARGET)
1474 + $(RMV) $(OBJECTS) $(DCETARGET)
1475
1476 distclean-local: clean-local
1477 $(RMV) Makefile
1478 @@ -60,7 +60,7 @@
1479 cd $(top_builddir) \
1480 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1481
1482 -$(TARGET) : $(OBJECTS)
1483 +$(DCETARGET) : $(OBJECTS)
1484 $(LINK.cc) -o $@ $^ $(LIBS)
1485 $(POST_BUILD_STEP)
1486
1487 diff -ruN icu/source/tools/genbidi/Makefile.in icu.aros/source/tools/genbidi/Makefile.in
1488 --- icu/source/tools/genbidi/Makefile.in 2009-07-01 19:50:40.000000000 +0100
1489 +++ icu.aros/source/tools/genbidi/Makefile.in 2013-04-09 21:16:36.763733247 +0100
1490 @@ -24,7 +24,7 @@
1491 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1492
1493 ## Target information
1494 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1495 +GBIDITARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1496
1497 ifneq ($(top_builddir),$(top_srcdir))
1498 CPPFLAGS += -I$(top_builddir)/common
1499 @@ -51,7 +51,7 @@
1500 dist: dist-local
1501 check: all check-local
1502
1503 -all-local: $(TARGET) $(MAN_FILES)
1504 +all-local: $(GBIDITARGET) $(MAN_FILES)
1505
1506 install-local: all-local install-man
1507
1508 @@ -64,7 +64,7 @@
1509
1510 clean-local:
1511 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1512 - $(RMV) $(TARGET) $(OBJECTS)
1513 + $(RMV) $(GBIDITARGET) $(OBJECTS)
1514
1515 distclean-local: clean-local
1516 $(RMV) Makefile
1517 @@ -75,7 +75,7 @@
1518 cd $(top_builddir) \
1519 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1520
1521 -$(TARGET) : $(OBJECTS)
1522 +$(GBIDITARGET) : $(OBJECTS)
1523 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1524 $(POST_BUILD_STEP)
1525
1526 diff -ruN icu/source/tools/genbrk/Makefile.in icu.aros/source/tools/genbrk/Makefile.in
1527 --- icu/source/tools/genbrk/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1528 +++ icu.aros/source/tools/genbrk/Makefile.in 2013-04-09 21:16:36.782733507 +0100
1529 @@ -24,7 +24,7 @@
1530 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1531
1532 ## Target information
1533 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1534 +GBRKTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1535
1536 ifneq ($(top_builddir),$(top_srcdir))
1537 CPPFLAGS += -I$(top_builddir)/common
1538 @@ -51,11 +51,11 @@
1539 dist: dist-local
1540 check: all check-local
1541
1542 -all-local: $(TARGET) $(MAN_FILES)
1543 +all-local: $(GBRKTARGET) $(MAN_FILES)
1544
1545 install-local: all-local install-man
1546 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1547 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1548 + $(INSTALL) $(GBRKTARGET) $(DESTDIR)$(bindir)
1549
1550 install-man: $(MAN_FILES)
1551 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1552 @@ -65,7 +65,7 @@
1553
1554 clean-local:
1555 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1556 - $(RMV) $(TARGET) $(OBJECTS)
1557 + $(RMV) $(GBRKTARGET) $(OBJECTS)
1558
1559 distclean-local: clean-local
1560 $(RMV) Makefile
1561 @@ -76,7 +76,7 @@
1562 cd $(top_builddir) \
1563 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1564
1565 -$(TARGET) : $(OBJECTS)
1566 +$(GBRKTARGET) : $(OBJECTS)
1567 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1568 $(POST_BUILD_STEP)
1569
1570 diff -ruN icu/source/tools/gencase/Makefile.in icu.aros/source/tools/gencase/Makefile.in
1571 --- icu/source/tools/gencase/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1572 +++ icu.aros/source/tools/gencase/Makefile.in 2013-04-09 21:16:36.803733793 +0100
1573 @@ -25,7 +25,7 @@
1574 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1575
1576 ## Target information
1577 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1578 +GCASETARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1579
1580 ifneq ($(top_builddir),$(top_srcdir))
1581 CPPFLAGS += -I$(top_builddir)/common
1582 @@ -52,7 +52,7 @@
1583 dist: dist-local
1584 check: all check-local
1585
1586 -all-local: $(TARGET) $(MAN_FILES)
1587 +all-local: $(GCASETARGET) $(MAN_FILES)
1588
1589 install-local: all-local install-man
1590
1591 @@ -64,7 +64,7 @@
1592
1593 clean-local:
1594 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1595 - $(RMV) $(TARGET) $(OBJECTS)
1596 + $(RMV) $(GCASETARGET) $(OBJECTS)
1597
1598 distclean-local: clean-local
1599 $(RMV) Makefile
1600 @@ -75,7 +75,7 @@
1601 cd $(top_builddir) \
1602 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1603
1604 -$(TARGET) : $(OBJECTS)
1605 +$(GCASETARGET) : $(OBJECTS)
1606 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1607 $(POST_BUILD_STEP)
1608
1609 diff -ruN icu/source/tools/genccode/Makefile.in icu.aros/source/tools/genccode/Makefile.in
1610 --- icu/source/tools/genccode/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1611 +++ icu.aros/source/tools/genccode/Makefile.in 2013-04-09 21:16:36.811733903 +0100
1612 @@ -25,7 +25,7 @@
1613 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1614
1615 ## Target information
1616 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1617 +GCODETARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1618
1619 ifneq ($(top_builddir),$(top_srcdir))
1620 CPPFLAGS += -I$(top_builddir)/common
1621 @@ -52,11 +52,11 @@
1622 dist: dist-local
1623 check: all check-local
1624
1625 -all-local: $(TARGET) $(MAN_FILES)
1626 +all-local: $(GCODETARGET) $(MAN_FILES)
1627
1628 install-local: all-local install-man
1629 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1630 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1631 + $(INSTALL) $(GCODETARGET) $(DESTDIR)$(sbindir)
1632
1633 install-man: $(MAN_FILES)
1634 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1635 @@ -66,7 +66,7 @@
1636
1637 clean-local:
1638 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1639 - $(RMV) $(TARGET) $(OBJECTS)
1640 + $(RMV) $(GCODETARGET) $(OBJECTS)
1641
1642 distclean-local: clean-local
1643 $(RMV) Makefile
1644 @@ -77,7 +77,7 @@
1645 cd $(top_builddir) \
1646 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1647
1648 -$(TARGET) : $(OBJECTS)
1649 +$(GCODETARGET) : $(OBJECTS)
1650 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1651 $(POST_BUILD_STEP)
1652
1653 diff -ruN icu/source/tools/gencfu/Makefile.in icu.aros/source/tools/gencfu/Makefile.in
1654 --- icu/source/tools/gencfu/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1655 +++ icu.aros/source/tools/gencfu/Makefile.in 2013-04-09 21:16:36.844734354 +0100
1656 @@ -24,7 +24,7 @@
1657 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1658
1659 ## Target information
1660 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1661 +GCFUTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1662
1663 ifneq ($(top_builddir),$(top_srcdir))
1664 CPPFLAGS += -I$(top_builddir)/common
1665 @@ -51,11 +51,11 @@
1666 dist: dist-local
1667 check: all check-local
1668
1669 -all-local: $(TARGET) $(MAN_FILES)
1670 +all-local: $(GCFUTARGET) $(MAN_FILES)
1671
1672 install-local: all-local install-man
1673 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1674 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1675 + $(INSTALL) $(GCFUTARGET) $(DESTDIR)$(bindir)
1676
1677 install-man: $(MAN_FILES)
1678 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1679 @@ -65,7 +65,7 @@
1680
1681 clean-local:
1682 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1683 - $(RMV) $(TARGET) $(OBJECTS)
1684 + $(RMV) $(GCFUTARGET) $(OBJECTS)
1685
1686 distclean-local: clean-local
1687 $(RMV) Makefile
1688 @@ -76,7 +76,7 @@
1689 cd $(top_builddir) \
1690 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1691
1692 -$(TARGET) : $(OBJECTS)
1693 +$(GCFUTARGET) : $(OBJECTS)
1694 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1695 $(POST_BUILD_STEP)
1696
1697 diff -ruN icu/source/tools/gencmn/Makefile.in icu.aros/source/tools/gencmn/Makefile.in
1698 --- icu/source/tools/gencmn/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1699 +++ icu.aros/source/tools/gencmn/Makefile.in 2013-04-09 21:16:36.853734477 +0100
1700 @@ -25,7 +25,7 @@
1701 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1702
1703 ## Target information
1704 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1705 +GCMNTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1706
1707 ifneq ($(top_builddir),$(top_srcdir))
1708 CPPFLAGS += -I$(top_builddir)/common
1709 @@ -52,11 +52,11 @@
1710 dist: dist-local
1711 check: all check-local
1712
1713 -all-local: $(TARGET) $(MAN_FILES)
1714 +all-local: $(GCMNTARGET) $(MAN_FILES)
1715
1716 install-local: all-local install-man
1717 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1718 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1719 + $(INSTALL) $(GCMNTARGET) $(DESTDIR)$(sbindir)
1720
1721 install-man: $(MAN_FILES)
1722 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1723 @@ -66,7 +66,7 @@
1724
1725 clean-local:
1726 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1727 - $(RMV) $(TARGET) $(OBJECTS)
1728 + $(RMV) $(GCMNTARGET) $(OBJECTS)
1729
1730 distclean-local: clean-local
1731 $(RMV) Makefile
1732 @@ -77,7 +77,7 @@
1733 cd $(top_builddir) \
1734 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1735
1736 -$(TARGET) : $(OBJECTS)
1737 +$(GCMNTARGET) : $(OBJECTS)
1738 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1739 $(POST_BUILD_STEP)
1740
1741 diff -ruN icu/source/tools/gencnval/Makefile.in icu.aros/source/tools/gencnval/Makefile.in
1742 --- icu/source/tools/gencnval/Makefile.in 2009-07-01 19:50:40.000000000 +0100
1743 +++ icu.aros/source/tools/gencnval/Makefile.in 2013-04-09 21:16:36.894735037 +0100
1744 @@ -25,7 +25,7 @@
1745 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1746
1747 ## Target information
1748 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1749 +GCNVALTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1750
1751 ifneq ($(top_builddir),$(top_srcdir))
1752 CPPFLAGS += -I$(top_builddir)/common
1753 @@ -52,11 +52,11 @@
1754 dist: dist-local
1755 check: all check-local
1756
1757 -all-local: $(TARGET) $(MAN_FILES)
1758 +all-local: $(GCNVALTARGET) $(MAN_FILES)
1759
1760 install-local: all-local install-man
1761 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1762 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1763 + $(INSTALL) $(GCNVALTARGET) $(DESTDIR)$(bindir)
1764
1765 install-man: $(MAN_FILES)
1766 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1767 @@ -66,7 +66,7 @@
1768
1769 clean-local:
1770 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1771 - $(RMV) $(TARGET) $(OBJECTS)
1772 + $(RMV) $(GCNVALTARGET) $(OBJECTS)
1773
1774 distclean-local: clean-local
1775 $(RMV) Makefile
1776 @@ -77,7 +77,7 @@
1777 cd $(top_builddir) \
1778 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1779
1780 -$(TARGET) : $(OBJECTS)
1781 +$(GCNVALTARGET) : $(OBJECTS)
1782 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1783 $(POST_BUILD_STEP)
1784
1785 diff -ruN icu/source/tools/genctd/Makefile.in icu.aros/source/tools/genctd/Makefile.in
1786 --- icu/source/tools/genctd/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1787 +++ icu.aros/source/tools/genctd/Makefile.in 2013-04-09 21:16:36.910735254 +0100
1788 @@ -24,7 +24,7 @@
1789 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1790
1791 ## Target information
1792 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1793 +GCTDTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1794
1795 ifneq ($(top_builddir),$(top_srcdir))
1796 CPPFLAGS += -I$(top_builddir)/common
1797 @@ -51,11 +51,11 @@
1798 dist: dist-local
1799 check: all check-local
1800
1801 -all-local: $(TARGET) $(MAN_FILES)
1802 +all-local: $(GCTDTARGET) $(MAN_FILES)
1803
1804 install-local: all-local install-man
1805 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
1806 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
1807 + $(INSTALL) $(GCTDTARGET) $(DESTDIR)$(bindir)
1808
1809 install-man: $(MAN_FILES)
1810 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1811 @@ -65,7 +65,7 @@
1812
1813 clean-local:
1814 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1815 - $(RMV) $(TARGET) $(OBJECTS)
1816 + $(RMV) $(GCTDTARGET) $(OBJECTS)
1817
1818 distclean-local: clean-local
1819 $(RMV) Makefile
1820 @@ -76,7 +76,7 @@
1821 cd $(top_builddir) \
1822 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1823
1824 -$(TARGET) : $(OBJECTS)
1825 +$(GCTDTARGET) : $(OBJECTS)
1826 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1827 $(POST_BUILD_STEP)
1828
1829 diff -ruN icu/source/tools/gennames/Makefile.in icu.aros/source/tools/gennames/Makefile.in
1830 --- icu/source/tools/gennames/Makefile.in 2009-07-01 19:50:40.000000000 +0100
1831 +++ icu.aros/source/tools/gennames/Makefile.in 2013-04-09 21:16:36.930735529 +0100
1832 @@ -25,7 +25,7 @@
1833 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1834
1835 ## Target information
1836 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1837 +GNAMESTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1838
1839 ifneq ($(top_builddir),$(top_srcdir))
1840 CPPFLAGS += -I$(top_builddir)/common
1841 @@ -52,11 +52,11 @@
1842 dist: dist-local
1843 check: all check-local
1844
1845 -all-local: $(TARGET) $(MAN_FILES)
1846 +all-local: $(GNAMESTARGET) $(MAN_FILES)
1847
1848 install-local: all-local install-man
1849 # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1850 -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1851 +# $(INSTALL) $(GNAMESTARGET) $(DESTDIR)$(sbindir)
1852
1853 install-man: $(MAN_FILES)
1854 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1855 @@ -66,7 +66,7 @@
1856
1857 clean-local:
1858 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1859 - $(RMV) $(TARGET) $(OBJECTS)
1860 + $(RMV) $(GNAMESTARGET) $(OBJECTS)
1861
1862 distclean-local: clean-local
1863 $(RMV) Makefile
1864 @@ -77,7 +77,7 @@
1865 cd $(top_builddir) \
1866 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1867
1868 -$(TARGET) : $(OBJECTS)
1869 +$(GNAMESTARGET) : $(OBJECTS)
1870 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1871 $(POST_BUILD_STEP)
1872
1873 diff -ruN icu/source/tools/gennorm/Makefile.in icu.aros/source/tools/gennorm/Makefile.in
1874 --- icu/source/tools/gennorm/Makefile.in 2009-07-01 19:50:42.000000000 +0100
1875 +++ icu.aros/source/tools/gennorm/Makefile.in 2013-04-09 21:16:36.936735611 +0100
1876 @@ -25,7 +25,7 @@
1877 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1878
1879 ## Target information
1880 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1881 +GNORMTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1882
1883 ifneq ($(top_builddir),$(top_srcdir))
1884 CPPFLAGS += -I$(top_builddir)/common
1885 @@ -52,11 +52,11 @@
1886 dist: dist-local
1887 check: all check-local
1888
1889 -all-local: $(TARGET) $(MAN_FILES)
1890 +all-local: $(GNORMTARGET) $(MAN_FILES)
1891
1892 install-local: all-local install-man
1893 # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1894 -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1895 +# $(INSTALL) $(GNORMTARGET) $(DESTDIR)$(sbindir)
1896
1897 install-man: $(MAN_FILES)
1898 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1899 @@ -66,7 +66,7 @@
1900
1901 clean-local:
1902 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1903 - $(RMV) $(TARGET) $(OBJECTS)
1904 + $(RMV) $(GNORMTARGET) $(OBJECTS)
1905
1906 distclean-local: clean-local
1907 $(RMV) Makefile
1908 @@ -77,7 +77,7 @@
1909 cd $(top_builddir) \
1910 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1911
1912 -$(TARGET) : $(OBJECTS)
1913 +$(GNORMTARGET) : $(OBJECTS)
1914 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1915 $(POST_BUILD_STEP)
1916
1917 diff -ruN icu/source/tools/genpname/Makefile.in icu.aros/source/tools/genpname/Makefile.in
1918 --- icu/source/tools/genpname/Makefile.in 2009-07-01 19:50:40.000000000 +0100
1919 +++ icu.aros/source/tools/genpname/Makefile.in 2013-04-09 21:16:36.978736185 +0100
1920 @@ -25,7 +25,7 @@
1921 CLEANFILES = *~ $(DEPS)
1922
1923 ## Target information
1924 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1925 +GPNAMETARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1926
1927 ifneq ($(top_builddir),$(top_srcdir))
1928 CPPFLAGS += -I$(top_builddir)/common
1929 @@ -52,11 +52,11 @@
1930 dist: dist-local
1931 check: all check-local
1932
1933 -all-local: $(TARGET)
1934 +all-local: $(GPNAMETARGET)
1935
1936 install-local: all-local
1937 # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1938 -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1939 +# $(INSTALL) $(GPNAMETARGET) $(DESTDIR)$(sbindir)
1940
1941 install-man: $(MAN_FILES)
1942 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1943 @@ -66,7 +66,7 @@
1944
1945 clean-local:
1946 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1947 - $(RMV) $(TARGET) $(OBJECTS)
1948 + $(RMV) $(GPNAMETARGET) $(OBJECTS)
1949
1950 distclean-local: clean-local
1951 $(RMV) Makefile
1952 @@ -77,7 +77,7 @@
1953 cd $(top_builddir) \
1954 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1955
1956 -$(TARGET) : $(OBJECTS)
1957 +$(GPNAMETARGET) : $(OBJECTS)
1958 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
1959 $(POST_BUILD_STEP)
1960
1961 diff -ruN icu/source/tools/genprops/Makefile.in icu.aros/source/tools/genprops/Makefile.in
1962 --- icu/source/tools/genprops/Makefile.in 2009-07-01 19:50:40.000000000 +0100
1963 +++ icu.aros/source/tools/genprops/Makefile.in 2013-04-09 21:16:37.018736731 +0100
1964 @@ -25,7 +25,7 @@
1965 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
1966
1967 ## Target information
1968 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1969 +GPROPSTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
1970
1971 ifneq ($(top_builddir),$(top_srcdir))
1972 CPPFLAGS += -I$(top_builddir)/common
1973 @@ -52,11 +52,11 @@
1974 dist: dist-local
1975 check: all check-local
1976
1977 -all-local: $(TARGET) $(MAN_FILES)
1978 +all-local: $(GPROPSTARGET) $(MAN_FILES)
1979
1980 install-local: all-local install-man
1981 # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
1982 -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
1983 +# $(INSTALL) $(GPROPSTARGET) $(DESTDIR)$(sbindir)
1984
1985 install-man: $(MAN_FILES)
1986 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
1987 @@ -66,7 +66,7 @@
1988
1989 clean-local:
1990 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
1991 - $(RMV) $(TARGET) $(OBJECTS)
1992 + $(RMV) $(GPROPSTARGET) $(OBJECTS)
1993
1994 distclean-local: clean-local
1995 $(RMV) Makefile
1996 @@ -77,7 +77,7 @@
1997 cd $(top_builddir) \
1998 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1999
2000 -$(TARGET) : $(OBJECTS)
2001 +$(GPROPSTARGET) : $(OBJECTS)
2002 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2003 $(POST_BUILD_STEP)
2004
2005 diff -ruN icu/source/tools/genrb/Makefile.in icu.aros/source/tools/genrb/Makefile.in
2006 --- icu/source/tools/genrb/Makefile.in 2009-07-01 19:50:40.000000000 +0100
2007 +++ icu.aros/source/tools/genrb/Makefile.in 2013-04-09 21:16:37.064737360 +0100
2008 @@ -34,7 +34,7 @@
2009 CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS)
2010
2011 ## Target information
2012 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2013 +GRBTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2014 DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
2015
2016 ifneq ($(top_builddir),$(top_srcdir))
2017 @@ -95,11 +95,11 @@
2018 dist: dist-local
2019 check: all check-local
2020
2021 -all-local: $(TARGET) $(DERB) $(MAN_FILES)
2022 +all-local: $(GRBTARGET) $(DERB) $(MAN_FILES)
2023
2024 install-local: all-local install-man
2025 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
2026 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
2027 + $(INSTALL) $(GRBTARGET) $(DESTDIR)$(bindir)
2028 $(INSTALL) $(DERB) $(DESTDIR)$(bindir)
2029
2030 install-man: $(MAN_FILES)
2031 @@ -110,7 +110,7 @@
2032
2033 clean-local:
2034 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2035 - $(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ) $(GENDTJAR_TEMP)
2036 + $(RMV) $(GRBTARGET) $(DERB) $(OBJECTS) $(DERB_OBJ) $(GENDTJAR_TEMP)
2037
2038 distclean-local: clean-local
2039 $(RMV) Makefile
2040 @@ -121,7 +121,7 @@
2041 cd $(top_builddir) \
2042 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2043
2044 -$(TARGET) : $(OBJECTS)
2045 +$(GRBTARGET) : $(OBJECTS)
2046 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2047 $(POST_BUILD_STEP)
2048
2049 diff -ruN icu/source/tools/gensprep/Makefile.in icu.aros/source/tools/gensprep/Makefile.in
2050 --- icu/source/tools/gensprep/Makefile.in 2009-07-01 19:50:38.000000000 +0100
2051 +++ icu.aros/source/tools/gensprep/Makefile.in 2013-04-09 21:16:37.109737975 +0100
2052 @@ -25,7 +25,7 @@
2053 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
2054
2055 ## Target information
2056 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2057 +GSPREPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2058
2059 ifneq ($(top_builddir),$(top_srcdir))
2060 CPPFLAGS += -I$(top_builddir)/common
2061 @@ -52,11 +52,11 @@
2062 dist: dist-local
2063 check: all check-local
2064
2065 -all-local: $(TARGET) $(MAN_FILES)
2066 +all-local: $(GSPREPTARGET) $(MAN_FILES)
2067
2068 install-local: all-local install-man
2069 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
2070 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
2071 + $(INSTALL) $(GSPREPTARGET) $(DESTDIR)$(sbindir)
2072
2073 install-man: $(MAN_FILES)
2074 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2075 @@ -66,7 +66,7 @@
2076
2077 clean-local:
2078 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2079 - $(RMV) $(TARGET) $(OBJECTS)
2080 + $(RMV) $(GSPREPTARGET) $(OBJECTS)
2081
2082 distclean-local: clean-local
2083 $(RMV) Makefile
2084 @@ -77,7 +77,7 @@
2085 cd $(top_builddir) \
2086 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2087
2088 -$(TARGET) : $(OBJECTS)
2089 +$(GSPREPTARGET) : $(OBJECTS)
2090 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2091 $(POST_BUILD_STEP)
2092
2093 diff -ruN icu/source/tools/gentest/Makefile.in icu.aros/source/tools/gentest/Makefile.in
2094 --- icu/source/tools/gentest/Makefile.in 2009-07-01 19:50:42.000000000 +0100
2095 +++ icu.aros/source/tools/gentest/Makefile.in 2013-04-09 21:16:37.118738098 +0100
2096 @@ -18,7 +18,7 @@
2097 CLEANFILES = *~ $(DEPS)
2098
2099 ## Target information
2100 -TARGET = gentest$(EXEEXT)
2101 +GTESTTARGET = gentest$(EXEEXT)
2102
2103 ifneq ($(top_builddir),$(top_srcdir))
2104 CPPFLAGS += -I$(top_builddir)/common
2105 @@ -46,7 +46,7 @@
2106 dist: dist-local
2107 check: all check-local
2108
2109 -all-local: $(TARGET)
2110 +all-local: $(GTESTTARGET)
2111
2112 install-local: all-local
2113
2114 @@ -54,7 +54,7 @@
2115
2116 clean-local:
2117 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2118 - $(RMV) $(TARGET) $(OBJECTS)
2119 + $(RMV) $(GTESTTARGET) $(OBJECTS)
2120
2121 distclean-local: clean-local
2122 $(RMV) Makefile
2123 @@ -65,7 +65,7 @@
2124 cd $(top_builddir) \
2125 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2126
2127 -$(TARGET) : $(OBJECTS)
2128 +$(GTESTTARGET) : $(OBJECTS)
2129 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2130 $(POST_BUILD_STEP)
2131
2132 diff -ruN icu/source/tools/genuca/Makefile.in icu.aros/source/tools/genuca/Makefile.in
2133 --- icu/source/tools/genuca/Makefile.in 2009-07-01 19:50:40.000000000 +0100
2134 +++ icu.aros/source/tools/genuca/Makefile.in 2013-04-09 21:16:37.138738371 +0100
2135 @@ -24,7 +24,7 @@
2136 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
2137
2138 ## Target information
2139 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2140 +GUCATARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2141
2142 ifneq ($(top_builddir),$(top_srcdir))
2143 CPPFLAGS += -I$(top_builddir)/common
2144 @@ -51,11 +51,11 @@
2145 dist: dist-local
2146 check: all check-local
2147
2148 -all-local: $(TARGET) $(MAN_FILES)
2149 +all-local: $(GUCATARGET) $(MAN_FILES)
2150
2151 install-local: all-local install-man
2152 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
2153 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
2154 + $(INSTALL) $(GUCATARGET) $(DESTDIR)$(sbindir)
2155
2156 install-man: $(MAN_FILES)
2157 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2158 @@ -65,7 +65,7 @@
2159
2160 clean-local:
2161 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2162 - $(RMV) $(TARGET) $(OBJECTS)
2163 + $(RMV) $(GUCATARGET) $(OBJECTS)
2164
2165 distclean-local: clean-local
2166 $(RMV) Makefile
2167 @@ -76,7 +76,7 @@
2168 cd $(top_builddir) \
2169 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2170
2171 -$(TARGET) : $(OBJECTS)
2172 +$(GUCATARGET) : $(OBJECTS)
2173 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2174 $(POST_BUILD_STEP)
2175
2176 diff -ruN icu/source/tools/icupkg/Makefile.in icu.aros/source/tools/icupkg/Makefile.in
2177 --- icu/source/tools/icupkg/Makefile.in 2009-07-01 19:50:38.000000000 +0100
2178 +++ icu.aros/source/tools/icupkg/Makefile.in 2013-04-09 21:16:37.146738481 +0100
2179 @@ -24,7 +24,7 @@
2180 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
2181
2182 ## Target information
2183 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2184 +ICUPKGTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2185
2186 ifneq ($(top_builddir),$(top_srcdir))
2187 CPPFLAGS += -I$(top_builddir)/common
2188 @@ -51,11 +51,11 @@
2189 dist: dist-local
2190 check: all check-local
2191
2192 -all-local: $(TARGET) $(MAN_FILES)
2193 +all-local: $(ICUPKGTARGET) $(MAN_FILES)
2194
2195 install-local: all-local install-man
2196 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
2197 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
2198 + $(INSTALL) $(ICUPKGTARGET) $(DESTDIR)$(sbindir)
2199
2200 install-man: $(MAN_FILES)
2201 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2202 @@ -66,7 +66,7 @@
2203
2204 clean-local:
2205 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2206 - $(RMV) $(TARGET) $(OBJECTS)
2207 + $(RMV) $(ICUPKGTARGET) $(OBJECTS)
2208
2209 distclean-local: clean-local
2210 $(RMV) Makefile
2211 @@ -77,7 +77,7 @@
2212 cd $(top_builddir) \
2213 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2214
2215 -$(TARGET) : $(OBJECTS)
2216 +$(ICUPKGTARGET) : $(OBJECTS)
2217 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2218 $(POST_BUILD_STEP)
2219
2220 diff -ruN icu/source/tools/icuswap/Makefile.in icu.aros/source/tools/icuswap/Makefile.in
2221 --- icu/source/tools/icuswap/Makefile.in 2009-07-01 19:50:42.000000000 +0100
2222 +++ icu.aros/source/tools/icuswap/Makefile.in 2013-04-09 21:16:37.153738576 +0100
2223 @@ -24,7 +24,7 @@
2224 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
2225
2226 ## Target information
2227 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2228 +ICUSWPTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2229
2230 ifneq ($(top_builddir),$(top_srcdir))
2231 CPPFLAGS += -I$(top_builddir)/common
2232 @@ -51,11 +51,11 @@
2233 dist: dist-local
2234 check: all check-local
2235
2236 -all-local: $(TARGET) $(MAN_FILES)
2237 +all-local: $(ICUSWPTARGET) $(MAN_FILES)
2238
2239 install-local: all-local install-man
2240 $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
2241 - $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)
2242 + $(INSTALL) $(ICUSWPTARGET) $(DESTDIR)$(sbindir)
2243
2244 install-man: $(MAN_FILES)
2245 # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2246 @@ -66,7 +66,7 @@
2247
2248 clean-local:
2249 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2250 - $(RMV) $(TARGET) $(OBJECTS)
2251 + $(RMV) $(ICUSWPTARGET) $(OBJECTS)
2252
2253 distclean-local: clean-local
2254 $(RMV) Makefile
2255 @@ -77,7 +77,7 @@
2256 cd $(top_builddir) \
2257 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2258
2259 -$(TARGET) : $(OBJECTS)
2260 +$(ICUSWPTARGET) : $(OBJECTS)
2261 echo Note: icuswap is obsolete - use icupkg instead.
2262 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2263 $(POST_BUILD_STEP)
2264 diff -ruN icu/source/tools/makeconv/Makefile.in icu.aros/source/tools/makeconv/Makefile.in
2265 --- icu/source/tools/makeconv/Makefile.in 2009-07-01 19:50:42.000000000 +0100
2266 +++ icu.aros/source/tools/makeconv/Makefile.in 2013-04-09 21:16:37.186739027 +0100
2267 @@ -24,7 +24,7 @@
2268 CLEANFILES = *~ $(DEPS) $(MAN_FILES)
2269
2270 ## Target information
2271 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2272 +MAKECONVTARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2273
2274 ifneq ($(top_builddir),$(top_srcdir))
2275 CPPFLAGS += -I$(top_builddir)/common
2276 @@ -51,11 +51,11 @@
2277 dist: dist-local
2278 check: all check-local
2279
2280 -all-local: $(TARGET) $(MAN_FILES)
2281 +all-local: $(MAKECONVTARGET) $(MAN_FILES)
2282
2283 install-local: all-local install-man
2284 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
2285 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
2286 + $(INSTALL) $(MAKECONVTARGET) $(DESTDIR)$(bindir)
2287
2288 install-man: $(MAN_FILES)
2289 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2290 @@ -66,7 +66,7 @@
2291
2292 clean-local:
2293 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2294 - $(RMV) $(TARGET) $(OBJECTS)
2295 + $(RMV) $(MAKECONVTARGET) $(OBJECTS)
2296
2297 distclean-local: clean-local
2298 $(RMV) Makefile
2299 @@ -77,7 +77,7 @@
2300 cd $(top_builddir) \
2301 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2302
2303 -$(TARGET) : $(OBJECTS)
2304 +$(MAKECONVTARGET) : $(OBJECTS)
2305 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2306 $(POST_BUILD_STEP)
2307
2308 diff -ruN icu/source/tools/pkgdata/Makefile.in icu.aros/source/tools/pkgdata/Makefile.in
2309 --- icu/source/tools/pkgdata/Makefile.in 2009-07-01 19:50:42.000000000 +0100
2310 +++ icu.aros/source/tools/pkgdata/Makefile.in 2013-04-09 21:16:37.198739190 +0100
2311 @@ -28,7 +28,7 @@
2312 endif
2313
2314 ## Target information
2315 -TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2316 +PKGDATATARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
2317
2318 ifneq ($(top_builddir),$(top_srcdir))
2319 CPPFLAGS += -I$(top_builddir)/common
2320 @@ -56,11 +56,11 @@
2321 dist: dist-local
2322 check: all check-local
2323
2324 -all-local: $(TARGET) $(MAN_FILES)
2325 +all-local: $(PKGDATATARGET) $(MAN_FILES)
2326
2327 install-local: all-local install-man
2328 $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
2329 - $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
2330 + $(INSTALL) $(PKGDATATARGET) $(DESTDIR)$(bindir)
2331
2332 install-man: $(MAN_FILES)
2333 $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
2334 @@ -71,7 +71,7 @@
2335
2336 clean-local:
2337 test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
2338 - $(RMV) $(TARGET) $(OBJECTS)
2339 + $(RMV) $(PKGDATATARGET) $(OBJECTS)
2340
2341 distclean-local: clean-local
2342 $(RMV) Makefile
2343 @@ -82,7 +82,7 @@
2344 cd $(top_builddir) \
2345 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2346
2347 -$(TARGET) : $(OBJECTS)
2348 +$(PKGDATATARGET) : $(OBJECTS)
2349 $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
2350 $(POST_BUILD_STEP)
2351
2352 diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu.aros/source/tools/pkgdata/pkgdata.cpp
2353 --- icu/source/tools/pkgdata/pkgdata.cpp 2009-07-01 19:50:42.000000000 +0100
2354 +++ icu.aros/source/tools/pkgdata/pkgdata.cpp 2013-04-09 21:17:15.024255833 +0100
2355 @@ -70,12 +70,12 @@
2356 #define WINDOWS_WITH_MSVC
2357 #endif
2358 #endif
2359 -#if !defined(WINDOWS_WITH_MSVC) && !defined(U_LINUX)
2360 +//#if !defined(WINDOWS_WITH_MSVC) && !defined(U_LINUX)
2361 #define BUILD_DATA_WITHOUT_ASSEMBLY
2362 -#endif
2363 -#if defined(WINDOWS_WITH_MSVC) || defined(U_LINUX)
2364 -#define CAN_WRITE_OBJ_CODE
2365 -#endif
2366 +//#endif
2367 +//#if defined(WINDOWS_WITH_MSVC) || defined(U_LINUX)
2368 +//#define CAN_WRITE_OBJ_CODE
2369 +//#endif
2370
2371 /*
2372 * When building the data library without assembly,
2373 @@ -115,9 +115,10 @@
2374 static int32_t pkg_createWithAssemblyCode(const char *targetDir, const char mode, const char *gencFilePath);
2375 static int32_t pkg_generateLibraryFile(const char *targetDir, const char mode, const char *objectFile, char *command = NULL);
2376 static int32_t pkg_archiveLibrary(const char *targetDir, const char *version, UBool reverseExt);
2377 -static void createFileNames(const char *version_major, const char *version, const char *libName, const UBool reverseExt);
2378 +static void createFileNames(const char mode, const char *version_major, const char *version, const char *libName, const UBool reverseExt);
2379
2380 static int32_t pkg_getOptionsFromICUConfig(UOption *option);
2381 +static int runCommand(const char* command);
2382
2383 enum {
2384 NAME,
2385 @@ -461,6 +462,17 @@
2386 return result;
2387 }
2388
2389 +static int runCommand(const char* command)
2390 +{
2391 + printf("pkgdata: %s\n", command);
2392 + int result = system(command);
2393 + if (result != 0)
2394 + {
2395 + printf("-- return status = %d\n", result);
2396 + }
2397 + return result;
2398 +}
2399 +
2400 #define LN_CMD "ln -s"
2401 #define RM_CMD "rm -f"
2402
2403 @@ -581,15 +593,14 @@
2404 }
2405 #endif
2406 /* Using the base libName and version number, generate the library file names. */
2407 - createFileNames(version_major, o->version, o->libName, reverseExt);
2408 + createFileNames(mode, version_major, o->version, o->libName, reverseExt);
2409
2410 if (o->version != 0 && o->rebuild == FALSE) {
2411 /* Check to see if a previous built data library file exists and check if it is the latest. */
2412 - sprintf(checkLibFile, "%s%s", targetDir, libFileNames[LIB_FILE_VERSION_TMP]);
2413 + sprintf(checkLibFile, "%s%s", targetDir, libFileNames[LIB_FILE_VERSION]);
2414 if (T_FileStream_file_exists(checkLibFile)) {
2415 if (isFileModTimeLater(checkLibFile, o->srcDir, TRUE) && isFileModTimeLater(checkLibFile, o->options)) {
2416 if (o->install != NULL) {
2417 - uprv_strcpy(libFileNames[LIB_FILE_VERSION], libFileNames[LIB_FILE_VERSION_TMP]);
2418 result = pkg_installLibrary(o->install, targetDir);
2419 }
2420 return result;
2421 @@ -666,7 +677,7 @@
2422 * Given the base libName and version numbers, generate the libary file names and store it in libFileNames.
2423 * Depending on the configuration, the library name may either end with version number or shared object suffix.
2424 */
2425 -static void createFileNames(const char *version_major, const char *version, const char *libName, UBool reverseExt) {
2426 +static void createFileNames(const char mode, const char *version_major, const char *version, const char *libName, UBool reverseExt) {
2427 sprintf(libFileNames[LIB_FILE], "%s%s",
2428 pkgDataFlags[LIBPREFIX],
2429 libName);
2430 @@ -704,6 +715,10 @@
2431 uprv_strcpy(libFileNames[LIB_FILE_VERSION_TMP], libFileNames[LIB_FILE_VERSION_MAJOR]);
2432 #endif
2433 }
2434 + if(mode == MODE_STATIC) {
2435 + sprintf(libFileNames[LIB_FILE_VERSION], "%s.%s", libFileNames[LIB_FILE], pkgDataFlags[A_EXT]);
2436 + libFileNames[LIB_FILE_VERSION_MAJOR][0]=0;
2437 + }
2438 }
2439
2440 /* Create the symbolic links for the final library file. */
2441 @@ -724,7 +739,7 @@
2442 LN_CMD,
2443 libFileNames[LIB_FILE_VERSION],
2444 libFileNames[LIB_FILE_VERSION_MAJOR]);
2445 - result = system(cmd);
2446 + result = runCommand(cmd);
2447 if (result != 0) {
2448 return result;
2449 }
2450 @@ -737,7 +752,7 @@
2451 libFileNames[LIB_FILE_VERSION],
2452 libFileNames[LIB_FILE], pkgDataFlags[SO_EXT]);
2453
2454 - result = system(cmd);
2455 + result = runCommand(cmd);
2456
2457 return result;
2458 }
2459 @@ -753,7 +768,7 @@
2460 installDir, PKGDATA_FILE_SEP_STRING, libFileNames[LIB_FILE_VERSION]
2461 );
2462
2463 - result = system(cmd);
2464 + result = runCommand(cmd);
2465
2466 if (result != 0) {
2467 return result;
2468 @@ -795,7 +810,7 @@
2469 srcDir, PKGDATA_FILE_SEP_STRING, buffer,
2470 installDir, PKGDATA_FILE_SEP_STRING, buffer);
2471
2472 - result = system(cmd);
2473 + result = runCommand(cmd);
2474 if (result != 0) {
2475 fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
2476 break;
2477 @@ -815,7 +830,7 @@
2478 }
2479 #else
2480 sprintf(cmd, "%s %s %s %s", WIN_INSTALL_CMD, srcDir, installDir, WIN_INSTALL_CMD_FLAGS);
2481 - result = system(cmd);
2482 + result = runCommand(cmd);
2483 if (result != 0) {
2484 fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
2485 }
2486 @@ -849,7 +864,17 @@
2487 targetDir,
2488 libFileNames[LIB_FILE_VERSION_TMP]);
2489
2490 - result = system(cmd);
2491 + result = runCommand(cmd);
2492 + if (result != 0) {
2493 + return result;
2494 + }
2495 +
2496 + sprintf(cmd, "%s %s%s",
2497 + pkgDataFlags[RANLIB],
2498 + targetDir,
2499 + libFileNames[LIB_FILE_VERSION]);
2500 +
2501 + result = runCommand(cmd);
2502 if (result != 0) {
2503 return result;
2504 }
2505 @@ -860,7 +885,7 @@
2506 targetDir,
2507 libFileNames[LIB_FILE_VERSION_TMP]);
2508
2509 - result = system(cmd);
2510 + result = runCommand(cmd);
2511 if (result != 0) {
2512 return result;
2513 }
2514 @@ -897,18 +922,30 @@
2515
2516 if (mode == MODE_STATIC) {
2517 #ifdef OS400
2518 - sprintf(cmd, "QSH CMD('%s %s %s%s.%s %s')",
2519 + sprintf(cmd, "QSH CMD('%s %s %s%s %s')",
2520 #else
2521 - sprintf(cmd, "%s %s %s%s.%s %s",
2522 + sprintf(cmd, "%s %s %s%s %s",
2523 #endif
2524 pkgDataFlags[AR],
2525 pkgDataFlags[ARFLAGS],
2526 targetDir,
2527 - libFileNames[LIB_FILE],
2528 - pkgDataFlags[A_EXT],
2529 + libFileNames[LIB_FILE_VERSION],
2530 objectFile);
2531
2532 - result = system(cmd);
2533 + result = runCommand(cmd);
2534 + if (result == 0)
2535 + {
2536 +#ifdef OS400
2537 + sprintf(cmd, "QSH CMD('%s %s%s.%s')",
2538 +#else
2539 + sprintf(cmd, "%s %s%s",
2540 +#endif
2541 + pkgDataFlags[RANLIB],
2542 + targetDir,
2543 + libFileNames[LIB_FILE_VERSION]);
2544 +
2545 + result = runCommand(cmd);
2546 + }
2547 } else /* if (mode == MODE_DLL) */ {
2548 #ifdef U_CYGWIN
2549 sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
2550 @@ -935,7 +972,7 @@
2551 pkgDataFlags[BIR_FLAGS]);
2552
2553 /* Generate the library file. */
2554 - result = system(cmd);
2555 + result = runCommand(cmd);
2556 }
2557
2558 if (freeCmd) {
2559 @@ -961,7 +998,7 @@
2560 tempObjectFile,
2561 gencFilePath);
2562
2563 - result = system(cmd);
2564 + result = runCommand(cmd);
2565 if (result != 0) {
2566 return result;
2567 }
2568 @@ -1043,7 +1080,7 @@
2569 tempObjectFile,
2570 gencmnFile);
2571
2572 - result = system(cmd);
2573 + result = runCommand(cmd);
2574 if (result != 0) {
2575 break;
2576 }
2577 @@ -1094,7 +1131,7 @@
2578 sprintf(cmd, "cat %s >> %s", gencmnFile, icudtAll);
2579 #endif
2580
2581 - result = system(cmd);
2582 + result = runCommand(cmd);
2583 if (result != 0) {
2584 break;
2585 }
2586 @@ -1110,14 +1147,13 @@
2587 pkgDataFlags[LIBFLAGS],
2588 tempObjectFile,
2589 gencmnFile);
2590 - result = system(cmd);
2591 + result = runCommand(cmd);
2592 if (result != 0) {
2593 break;
2594 }
2595
2596 - sprintf(buffer, "%s %s",
2597 - buffer,
2598 - tempObjectFile);
2599 + strcat(buffer, " ");
2600 + strcat(buffer, tempObjectFile);
2601 #endif
2602
2603 if (i > 0) {
2604 @@ -1139,11 +1175,10 @@
2605 tempObjectFile,
2606 icudtAll);
2607
2608 - result = system(cmd);
2609 + result = runCommand(cmd);
2610 if (result == 0) {
2611 - sprintf(buffer, "%s %s",
2612 - buffer,
2613 - tempObjectFile);
2614 + strcat(buffer, " ");
2615 + strcat(buffer, tempObjectFile);
2616 }
2617 #endif
2618
2619 @@ -1222,7 +1257,7 @@
2620 );
2621 }
2622
2623 - return system(cmd);
2624 + return runCommand(cmd);
2625 }
2626 #endif
2627
2628 diff -ruN icu/source/tools/toolutil/Makefile.in icu.aros/source/tools/toolutil/Makefile.in
2629 --- icu/source/tools/toolutil/Makefile.in 2009-07-01 19:50:42.000000000 +0100
2630 +++ icu.aros/source/tools/toolutil/Makefile.in 2013-04-09 21:16:37.236739710 +0100
2631 @@ -27,7 +27,7 @@
2632 TARGET_STUBNAME=$(TOOLUTIL_STUBNAME)
2633
2634 ifneq ($(ENABLE_STATIC),)
2635 -TARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
2636 +TOOLUTILTARGET = $(LIBDIR)/$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
2637 endif
2638
2639 ifneq ($(ENABLE_SHARED),)
2640 @@ -35,7 +35,7 @@
2641 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
2642 endif
2643
2644 -ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
2645 +ALL_TARGETS = $(TOOLUTILTARGET) $(ALL_SO_TARGETS)
2646
2647 DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
2648 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
2649 @@ -85,7 +85,7 @@
2650 install-library: all-local
2651 $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
2652 ifneq ($(ENABLE_STATIC),)
2653 - $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
2654 + $(INSTALL-L) $(TOOLUTILTARGET) $(DESTDIR)$(libdir)
2655 endif
2656 ifneq ($(ENABLE_SHARED),)
2657 $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
2658 @@ -122,7 +122,7 @@
2659 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2660
2661 ifneq ($(ENABLE_STATIC),)
2662 -$(TARGET): $(STATIC_OBJECTS)
2663 +$(TOOLUTILTARGET): $(STATIC_OBJECTS)
2664 $(AR) $(ARFLAGS) $(AR_OUTOPT)$@ $^
2665 $(RANLIB) $@
2666 endif
Mirror of AROS' svn.