i18npool: use CustomTarget_*.mk makefiles

Also done lot of simplification and modernization.

i18npool: use CustomTarget_*.mk makefiles
Also done lot of simplification and modernization.
15bd35e4 · Matúš Kukan · 1140c380 · 15bd35e4 · 15bd35e4 · 15bd35e4
Kaydet (Commit) 15bd35e4 authored Mar 17, 2012 tarafından Matúš Kukan
17 changed files
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -26,70 +26,81 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.

-all : OpenOffice_dat.c data/dict_ja.cxx data/dict_zh.cxx
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator,new_style))

-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild_simple.mk
+IPBI := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)

-data:
-	mkdir data
+$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
+	$(IPBI)/dict_ja.cxx $(IPBI)/dict_zh.cxx $(IPBI)/OpenOffice_dat.c

-data/dict_%.cxx : data/dict_%_invis.cxx
-	sed 's/\tconst/\tSAL_DLLPUBLIC_EXPORT const/' $< > $@
-
-data/dict_%_invis.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic data
-ifeq ($(OS_FOR_BUILD),WNT)
-	$(call gb_Helper_execute,gendict `cygpath -m $<` $@)
-else
-	$(call gb_Helper_execute,gendict $< $@)
-endif
+$(IPBI)/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
+		$(call gb_Executable_get_target_for_build,gendict) | $(IPBI)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		$(call gb_Helper_execute,gendict) $< $@.tmp && \
+		sed 's/\tconst/\tSAL_DLLPUBLIC_EXPORT const/' $@.tmp > $@  && \
+		rm $@.tmp)

 ifeq ($(SYSTEM_GENBRK),)
+GENBRKTARGET := $(call gb_Executable_get_target_for_build,genbrk)
 GENBRK := $(call gb_Helper_execute,genbrk)
 else
+GENBRKTARGET :=
 GENBRK := $(SYSTEM_GENBRK)
 endif

 ifeq ($(SYSTEM_GENCCODE),)
+GENCCODETARGET := $(call gb_Executable_get_target_for_build,genccode)
 GENCCODE := $(call gb_Helper_execute,genccode)
 else
+GENCCODETARGET :=
 GENCCODE := $(SYSTEM_GENCCODE)
 endif

 ifeq ($(SYSTEM_GENCMN),)
+GENCMNTARGET := $(call gb_Executable_get_target_for_build,gencmn)
 GENCMN := $(call gb_Helper_execute,gencmn)
 else
+GENCMNTARGET :=
 GENCMN := $(SYSTEM_GENCMN)
 endif

-TEMPFILE := $(shell $(gb_MKTEMP))
-BRKFILES := $(notdir $(subst .txt,.brk,$(wildcard $(SRC_ROOT)/i18npool/source/breakiterator/data/*.txt)))
+BRKFILES := $(subst .txt,.brk,$(notdir \
+	$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt)))

 # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
 # The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools,
 # so the output (OpenOffice_dat.c) is changed here to include a pragma to disable the warnings.
-# Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
-OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES))
-	$(foreach brkfile,$(BRKFILES),$(shell echo $(brkfile) >> $(TEMPFILE)))
-	$(GENCMN) -n OpenOffice -t tmp -S -d ./ 0 $(TEMPFILE)
-	echo '#ifdef _MSC_VER' > $@
-	echo '#pragma warning( disable : 4229 4668 )' >> $@
-	echo '#endif' >> $@
-	cat $(subst _dat,_tmp,$@) >> $@
+# Output of gencmn is redirected to OpenOffice_tmp.c with the -t switch.
+$(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCMNTARGET)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		RESPONSEFILE=$(shell $(gb_MKTEMP)) && \
+		$(foreach brk,$(BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \
+		$(GENCMN) -n OpenOffice -t tmp -S -d $(IPBI)/ 0 $${RESPONSEFILE} && \
+		rm -f $${RESPONSEFILE} && \
+		echo '#ifdef _MSC_VER' > $@ && \
+		echo '#pragma warning( disable : 4229 4668 )' >> $@ && \
+		echo '#endif' >> $@ && \
+		cat $(subst _dat,_tmp,$@) >> $@)

-%_brk.c : %.brk
-	$(GENCCODE) -n OpenOffice -d ./ $<
+$(IPBI)/%_brk.c : $(IPBI)/%.brk $(GENCCODETARGET)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		$(GENCCODE) -n OpenOffice -d $(IPBI)/ $< \
+			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))

-%.brk : %.txt.p
-	$(GENBRK) -r $< -o $@
+$(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		$(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))

 # fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
-%.txt.p : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt
+$(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(IPBI)/.dir
 ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
 	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
 else
 	cp $< $@
 endif

-.PHONY: all
 # vim: set noet sw=4 ts=4:
--- a/i18npool/source/indexentry/Makefile
+++ b/i18npool/source/indexentry/Makefile
@@ -26,20 +26,26 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.

-all : $(subst .txt,.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/indexentry/data/*.txt)))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator,new_style))

-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild_simple.mk
+IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator)
+TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt))

-%.cxx : %_invis.cxx
-	sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
+$(call gb_CustomTarget_get_target,i18npool/collator) : \
+	$(IPCO)/lrl_include.hxx $(foreach txt,$(TXTLIST), \
+		$(patsubst %.txt,$(IPCO)/collator_%.cxx,$(txt)))

-%_invis.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt
-ifeq ($(OS_FOR_BUILD),WNT)
-	$(call gb_Helper_execute,genindex_data `cygpath -m $<` $@ $*)
-else
-	$(call gb_Helper_execute,genindex_data $< $@ $*)
-endif
+$(IPCO)/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt \
+		$(call gb_Executable_get_target_for_build,gencoll_rule) | $(IPCO)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,gencoll_rule) $< $@.tmp $* && \
+		sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
+		rm $@.tmp)
+
+$(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(TXTLIST), \
+		$(firstword $(subst _, ,$(txt)))))"' > $@

-.PHONY: all
 # vim: set noet sw=4 ts=4:
--- a/i18npool/source/textconversion/Makefile
+++ b/i18npool/source/textconversion/Makefile
@@ -26,21 +26,20 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.

-all : $(subst .dic,.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/textconversion/data/*.dic)))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry,new_style))

-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild_simple.mk
+IPIE := $(call gb_CustomTarget_get_workdir,i18npool/indexentry)

-%.cxx : %_invis.cxx
-	sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
+$(call gb_CustomTarget_get_target,i18npool/indexentry) : \
+	$(patsubst %.txt,$(IPIE)/%.cxx,$(notdir \
+		$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt)))

-%_invis.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic
-ifeq ($(OS_FOR_BUILD),WNT)
-	$(call gb_Helper_execute,genconv_dict $* `cygpath -m $<` $@)
-else
-	$(call gb_Helper_execute,genconv_dict $* $< $@)
-endif
+$(IPIE)/%.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt \
+		$(call gb_Executable_get_target_for_build,genindex_data) | $(IPIE)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \
+		sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
+		rm $@.tmp)

-
-.PHONY: all
 # vim: set noet sw=4 ts=4:
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -26,33 +26,38 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.

-all : $(patsubst %.xml,localedata_%.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/localedata/data/*.xml)))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata,new_style))

-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild_simple.mk
+IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata)

+$(call gb_CustomTarget_get_target,i18npool/localedata) : \
+	$(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
+		$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
+
+# TODO: move this to gbuild/
 my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/)
 my_components := component/sax/source/expatwrap/expwrap.component

-localedata_%.cxx : localedata_%_invis.cxx
-	sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
-
-ifeq ($(OS_FOR_BUILD),WNT)
-localedata_%_invis.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml saxparser.rdb \
-	$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
-	$(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
-else
-localedata_%_invis.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml saxparser.rdb \
-	$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
-	$(call gb_Helper_execute,saxparser $* $< $@ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
-endif
-
-saxparser.rdb : saxparser.input
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR)/xml/ -o $@ \
-		$(SOLARENV)/bin/packcomponents.xslt saxparser.input)
-
-saxparser.input :
+$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
+		$(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
+			$(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \
+			-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib \
+			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
+		sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
+		rm $@.tmp)
+
+$(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \
+		$(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
+			-o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
+
+$(IPLD)/saxparser.input :| $(IPLD)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '<list><filename>$(my_components)</filename></list>' > $@

-.PHONY: all
 # vim: set noet sw=4 ts=4:
--- a/i18npool/source/collator/Makefile
+++ b/i18npool/source/collator/Makefile
@@ -26,24 +26,20 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.

-txtlist := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion,new_style))

-all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist)))
+IPTC := $(call gb_CustomTarget_get_workdir,i18npool/textconversion)

-include $(GBUILDDIR)/gbuild_simple.mk
+$(call gb_CustomTarget_get_target,i18npool/textconversion) : \
+	$(patsubst %.dic,$(IPTC)/%.cxx,$(notdir \
+		$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic)))

-collator_%.cxx : collator_%_invis.cxx
-	sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
+$(IPTC)/%.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic \
+		$(call gb_Executable_get_target_for_build,genconv_dict) | $(IPTC)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \
+		sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
+		rm $@.tmp)

-collator_%_invis.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt
-ifeq ($(OS_FOR_BUILD),WNT)
-	$(call gb_Helper_execute,gencoll_rule `cygpath -m $<` $@ $*)
-else
-	$(call gb_Helper_execute,gencoll_rule $< $@ $*)
-endif
-
-lrl_include.hxx : $(txtlist)
-	echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(^F),$(firstword $(subst _, ,$(txt)))))"' > $@
-
-.PHONY: all
 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -28,14 +28,13 @@

 $(eval $(call gb_Library_Library,collator_data))

-$(eval $(call gb_Library_add_package_headers,collator_data,i18npool_generated))
-
 $(eval $(call gb_Library_add_linked_libs,collator_data,\
    $(gb_STDLIBS) \
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/collator/collator_*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\
+		CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_dict_ja.mk
+++ b/i18npool/Library_dict_ja.mk
@@ -28,14 +28,12 @@

 $(eval $(call gb_Library_Library,dict_ja))

-$(eval $(call gb_Library_add_package_headers,dict_ja,i18npool_generated))
-
 $(eval $(call gb_Library_add_linked_libs,dict_ja,\
    $(gb_STDLIBS) \
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\
-	CustomTarget/i18npool/source/breakiterator/data/dict_ja \
+	CustomTarget/i18npool/breakiterator/dict_ja \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_dict_zh.mk
+++ b/i18npool/Library_dict_zh.mk
@@ -28,14 +28,12 @@

 $(eval $(call gb_Library_Library,dict_zh))

-$(eval $(call gb_Library_add_package_headers,dict_zh,i18npool_generated))
-
 $(eval $(call gb_Library_add_linked_libs,dict_zh,\
    $(gb_STDLIBS) \
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\
-	CustomTarget/i18npool/source/breakiterator/data/dict_zh \
+	CustomTarget/i18npool/breakiterator/dict_zh \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -28,14 +28,11 @@

 $(eval $(call gb_Library_Library,i18npool))

-$(eval $(call gb_Library_add_package_headers,i18npool,i18npool_generated))
-
 $(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool))

 $(eval $(call gb_Library_set_include,i18npool,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/i18npool/inc \
-	-I$(WORKDIR)/CustomTarget/i18npool/source/collator \
 ))

 $(eval $(call gb_Library_add_api,i18npool,\
@@ -139,11 +136,16 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
 	i18npool/source/transliteration/transliteration_OneToOne \
 ))

-BRKFILES := $(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/breakiterator/*_brk.c))) \
+# collator_unicode.cxx includes generated lrl_include.hxx
+$(call gb_CxxObject_get_target,i18npool/source/collator/collator_unicode) : \
+	INCLUDE += -I$(call gb_CustomTarget_get_workdir,i18npool/collator)
+$(call gb_CxxObject_get_target,i18npool/source/collator/collator_unicode) :| \
+	$(call gb_CustomTarget_get_workdir,i18npool/collator)/lrl_include.hxx

 $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
-	CustomTarget/i18npool/source/breakiterator/OpenOffice_dat \
-	$(BRKFILES) \
+	CustomTarget/i18npool/breakiterator/OpenOffice_dat \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt),\
+		CustomTarget/i18npool/breakiterator/$(notdir $(basename $(txt)))_brk) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -28,14 +28,13 @@

 $(eval $(call gb_Library_Library,index_data))

-$(eval $(call gb_Library_add_package_headers,index_data,i18npool_generated))
-
 $(eval $(call gb_Library_add_linked_libs,index_data,\
    $(gb_STDLIBS) \
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,index_data,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/indexentry/*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\
+		CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -28,27 +28,25 @@

 $(eval $(call gb_Library_Library,localedata_en))

-$(eval $(call gb_Library_add_package_headers,localedata_en,i18npool_generated))
-
 $(eval $(call gb_Library_add_linked_libs,localedata_en,\
    $(gb_STDLIBS) \
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
-	CustomTarget/i18npool/source/localedata/localedata_en_AU \
-	CustomTarget/i18npool/source/localedata/localedata_en_BZ \
-	CustomTarget/i18npool/source/localedata/localedata_en_CA \
-	CustomTarget/i18npool/source/localedata/localedata_en_GB \
-	CustomTarget/i18npool/source/localedata/localedata_en_GH \
-	CustomTarget/i18npool/source/localedata/localedata_en_IE \
-	CustomTarget/i18npool/source/localedata/localedata_en_JM \
-	CustomTarget/i18npool/source/localedata/localedata_en_NA \
-	CustomTarget/i18npool/source/localedata/localedata_en_NZ \
-	CustomTarget/i18npool/source/localedata/localedata_en_PH \
-	CustomTarget/i18npool/source/localedata/localedata_en_TT \
-	CustomTarget/i18npool/source/localedata/localedata_en_US \
-	CustomTarget/i18npool/source/localedata/localedata_en_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_en_ZW \
+	CustomTarget/i18npool/localedata/localedata_en_AU \
+	CustomTarget/i18npool/localedata/localedata_en_BZ \
+	CustomTarget/i18npool/localedata/localedata_en_CA \
+	CustomTarget/i18npool/localedata/localedata_en_GB \
+	CustomTarget/i18npool/localedata/localedata_en_GH \
+	CustomTarget/i18npool/localedata/localedata_en_IE \
+	CustomTarget/i18npool/localedata/localedata_en_JM \
+	CustomTarget/i18npool/localedata/localedata_en_NA \
+	CustomTarget/i18npool/localedata/localedata_en_NZ \
+	CustomTarget/i18npool/localedata/localedata_en_PH \
+	CustomTarget/i18npool/localedata/localedata_en_TT \
+	CustomTarget/i18npool/localedata/localedata_en_US \
+	CustomTarget/i18npool/localedata/localedata_en_ZA \
+	CustomTarget/i18npool/localedata/localedata_en_ZW \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -34,26 +34,26 @@ $(eval $(call gb_Library_add_linked_libs,localedata_es,\
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\
-	CustomTarget/i18npool/source/localedata/localedata_es_AR \
-	CustomTarget/i18npool/source/localedata/localedata_es_BO \
-	CustomTarget/i18npool/source/localedata/localedata_es_CL \
-	CustomTarget/i18npool/source/localedata/localedata_es_CO \
-	CustomTarget/i18npool/source/localedata/localedata_es_CR \
-	CustomTarget/i18npool/source/localedata/localedata_es_DO \
-	CustomTarget/i18npool/source/localedata/localedata_es_EC \
-	CustomTarget/i18npool/source/localedata/localedata_es_ES \
-	CustomTarget/i18npool/source/localedata/localedata_es_GT \
-	CustomTarget/i18npool/source/localedata/localedata_es_HN \
-	CustomTarget/i18npool/source/localedata/localedata_es_MX \
-	CustomTarget/i18npool/source/localedata/localedata_es_NI \
-	CustomTarget/i18npool/source/localedata/localedata_es_PA \
-	CustomTarget/i18npool/source/localedata/localedata_es_PE \
-	CustomTarget/i18npool/source/localedata/localedata_es_PR \
-	CustomTarget/i18npool/source/localedata/localedata_es_PY \
-	CustomTarget/i18npool/source/localedata/localedata_es_SV \
-	CustomTarget/i18npool/source/localedata/localedata_es_UY \
-	CustomTarget/i18npool/source/localedata/localedata_es_VE \
-	CustomTarget/i18npool/source/localedata/localedata_gl_ES \
+	CustomTarget/i18npool/localedata/localedata_es_AR \
+	CustomTarget/i18npool/localedata/localedata_es_BO \
+	CustomTarget/i18npool/localedata/localedata_es_CL \
+	CustomTarget/i18npool/localedata/localedata_es_CO \
+	CustomTarget/i18npool/localedata/localedata_es_CR \
+	CustomTarget/i18npool/localedata/localedata_es_DO \
+	CustomTarget/i18npool/localedata/localedata_es_EC \
+	CustomTarget/i18npool/localedata/localedata_es_ES \
+	CustomTarget/i18npool/localedata/localedata_es_GT \
+	CustomTarget/i18npool/localedata/localedata_es_HN \
+	CustomTarget/i18npool/localedata/localedata_es_MX \
+	CustomTarget/i18npool/localedata/localedata_es_NI \
+	CustomTarget/i18npool/localedata/localedata_es_PA \
+	CustomTarget/i18npool/localedata/localedata_es_PE \
+	CustomTarget/i18npool/localedata/localedata_es_PR \
+	CustomTarget/i18npool/localedata/localedata_es_PY \
+	CustomTarget/i18npool/localedata/localedata_es_SV \
+	CustomTarget/i18npool/localedata/localedata_es_UY \
+	CustomTarget/i18npool/localedata/localedata_es_VE \
+	CustomTarget/i18npool/localedata/localedata_gl_ES \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -34,79 +34,79 @@ $(eval $(call gb_Library_add_linked_libs,localedata_euro,\
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
-	CustomTarget/i18npool/source/localedata/localedata_an_ES \
-	CustomTarget/i18npool/source/localedata/localedata_ast_ES \
-	CustomTarget/i18npool/source/localedata/localedata_be_BY \
-	CustomTarget/i18npool/source/localedata/localedata_bg_BG \
-	CustomTarget/i18npool/source/localedata/localedata_br_FR \
-	CustomTarget/i18npool/source/localedata/localedata_bs_BA \
-	CustomTarget/i18npool/source/localedata/localedata_ca_ES \
-	CustomTarget/i18npool/source/localedata/localedata_cs_CZ \
-	CustomTarget/i18npool/source/localedata/localedata_cv_RU \
-	CustomTarget/i18npool/source/localedata/localedata_cy_GB \
-	CustomTarget/i18npool/source/localedata/localedata_da_DK \
-	CustomTarget/i18npool/source/localedata/localedata_de_AT \
-	CustomTarget/i18npool/source/localedata/localedata_de_CH \
-	CustomTarget/i18npool/source/localedata/localedata_de_DE \
-	CustomTarget/i18npool/source/localedata/localedata_de_LI \
-	CustomTarget/i18npool/source/localedata/localedata_de_LU \
-	CustomTarget/i18npool/source/localedata/localedata_dsb_DE \
-	CustomTarget/i18npool/source/localedata/localedata_el_GR \
-	CustomTarget/i18npool/source/localedata/localedata_et_EE \
-	CustomTarget/i18npool/source/localedata/localedata_eu \
-	CustomTarget/i18npool/source/localedata/localedata_fi_FI \
-	CustomTarget/i18npool/source/localedata/localedata_fo_FO \
-	CustomTarget/i18npool/source/localedata/localedata_fr_BE \
-	CustomTarget/i18npool/source/localedata/localedata_fr_CA \
-	CustomTarget/i18npool/source/localedata/localedata_fr_CH \
-	CustomTarget/i18npool/source/localedata/localedata_fr_FR \
-	CustomTarget/i18npool/source/localedata/localedata_fr_LU \
-	CustomTarget/i18npool/source/localedata/localedata_fr_MC \
-	CustomTarget/i18npool/source/localedata/localedata_fur_IT \
-	CustomTarget/i18npool/source/localedata/localedata_fy_NL \
-	CustomTarget/i18npool/source/localedata/localedata_ga_IE \
-	CustomTarget/i18npool/source/localedata/localedata_gd_GB \
-	CustomTarget/i18npool/source/localedata/localedata_gsc_FR \
-	CustomTarget/i18npool/source/localedata/localedata_hr_HR \
-	CustomTarget/i18npool/source/localedata/localedata_hsb_DE \
-	CustomTarget/i18npool/source/localedata/localedata_is_IS \
-	CustomTarget/i18npool/source/localedata/localedata_it_CH \
-	CustomTarget/i18npool/source/localedata/localedata_it_IT \
-	CustomTarget/i18npool/source/localedata/localedata_ka_GE \
-	CustomTarget/i18npool/source/localedata/localedata_kl_GL \
-	CustomTarget/i18npool/source/localedata/localedata_la_VA \
-	CustomTarget/i18npool/source/localedata/localedata_lb_LU \
-	CustomTarget/i18npool/source/localedata/localedata_lt_LT \
-	CustomTarget/i18npool/source/localedata/localedata_ltg_LV \
-	CustomTarget/i18npool/source/localedata/localedata_lv_LV \
-	CustomTarget/i18npool/source/localedata/localedata_mk_MK \
-	CustomTarget/i18npool/source/localedata/localedata_mt_MT \
-	CustomTarget/i18npool/source/localedata/localedata_nb_NO \
-	CustomTarget/i18npool/source/localedata/localedata_nl_BE \
-	CustomTarget/i18npool/source/localedata/localedata_nl_NL \
-	CustomTarget/i18npool/source/localedata/localedata_nn_NO \
-	CustomTarget/i18npool/source/localedata/localedata_no_NO \
-	CustomTarget/i18npool/source/localedata/localedata_oc_FR \
-	CustomTarget/i18npool/source/localedata/localedata_pl_PL \
-	CustomTarget/i18npool/source/localedata/localedata_pt_BR \
-	CustomTarget/i18npool/source/localedata/localedata_pt_PT \
-	CustomTarget/i18npool/source/localedata/localedata_ro_RO \
-	CustomTarget/i18npool/source/localedata/localedata_rue_SK \
-	CustomTarget/i18npool/source/localedata/localedata_ru_RU \
-	CustomTarget/i18npool/source/localedata/localedata_sc_IT \
-	CustomTarget/i18npool/source/localedata/localedata_sh_ME \
-	CustomTarget/i18npool/source/localedata/localedata_sh_RS \
-	CustomTarget/i18npool/source/localedata/localedata_sh_YU \
-	CustomTarget/i18npool/source/localedata/localedata_sk_SK \
-	CustomTarget/i18npool/source/localedata/localedata_sl_SI \
-	CustomTarget/i18npool/source/localedata/localedata_sr_ME \
-	CustomTarget/i18npool/source/localedata/localedata_sr_RS \
-	CustomTarget/i18npool/source/localedata/localedata_sr_YU \
-	CustomTarget/i18npool/source/localedata/localedata_sv_FI \
-	CustomTarget/i18npool/source/localedata/localedata_sv_SE \
-	CustomTarget/i18npool/source/localedata/localedata_tr_TR \
-	CustomTarget/i18npool/source/localedata/localedata_uk_UA \
-	CustomTarget/i18npool/source/localedata/localedata_wa_BE \
+	CustomTarget/i18npool/localedata/localedata_an_ES \
+	CustomTarget/i18npool/localedata/localedata_ast_ES \
+	CustomTarget/i18npool/localedata/localedata_be_BY \
+	CustomTarget/i18npool/localedata/localedata_bg_BG \
+	CustomTarget/i18npool/localedata/localedata_br_FR \
+	CustomTarget/i18npool/localedata/localedata_bs_BA \
+	CustomTarget/i18npool/localedata/localedata_ca_ES \
+	CustomTarget/i18npool/localedata/localedata_cs_CZ \
+	CustomTarget/i18npool/localedata/localedata_cv_RU \
+	CustomTarget/i18npool/localedata/localedata_cy_GB \
+	CustomTarget/i18npool/localedata/localedata_da_DK \
+	CustomTarget/i18npool/localedata/localedata_de_AT \
+	CustomTarget/i18npool/localedata/localedata_de_CH \
+	CustomTarget/i18npool/localedata/localedata_de_DE \
+	CustomTarget/i18npool/localedata/localedata_de_LI \
+	CustomTarget/i18npool/localedata/localedata_de_LU \
+	CustomTarget/i18npool/localedata/localedata_dsb_DE \
+	CustomTarget/i18npool/localedata/localedata_el_GR \
+	CustomTarget/i18npool/localedata/localedata_et_EE \
+	CustomTarget/i18npool/localedata/localedata_eu \
+	CustomTarget/i18npool/localedata/localedata_fi_FI \
+	CustomTarget/i18npool/localedata/localedata_fo_FO \
+	CustomTarget/i18npool/localedata/localedata_fr_BE \
+	CustomTarget/i18npool/localedata/localedata_fr_CA \
+	CustomTarget/i18npool/localedata/localedata_fr_CH \
+	CustomTarget/i18npool/localedata/localedata_fr_FR \
+	CustomTarget/i18npool/localedata/localedata_fr_LU \
+	CustomTarget/i18npool/localedata/localedata_fr_MC \
+	CustomTarget/i18npool/localedata/localedata_fur_IT \
+	CustomTarget/i18npool/localedata/localedata_fy_NL \
+	CustomTarget/i18npool/localedata/localedata_ga_IE \
+	CustomTarget/i18npool/localedata/localedata_gd_GB \
+	CustomTarget/i18npool/localedata/localedata_gsc_FR \
+	CustomTarget/i18npool/localedata/localedata_hr_HR \
+	CustomTarget/i18npool/localedata/localedata_hsb_DE \
+	CustomTarget/i18npool/localedata/localedata_is_IS \
+	CustomTarget/i18npool/localedata/localedata_it_CH \
+	CustomTarget/i18npool/localedata/localedata_it_IT \
+	CustomTarget/i18npool/localedata/localedata_ka_GE \
+	CustomTarget/i18npool/localedata/localedata_kl_GL \
+	CustomTarget/i18npool/localedata/localedata_la_VA \
+	CustomTarget/i18npool/localedata/localedata_lb_LU \
+	CustomTarget/i18npool/localedata/localedata_lt_LT \
+	CustomTarget/i18npool/localedata/localedata_ltg_LV \
+	CustomTarget/i18npool/localedata/localedata_lv_LV \
+	CustomTarget/i18npool/localedata/localedata_mk_MK \
+	CustomTarget/i18npool/localedata/localedata_mt_MT \
+	CustomTarget/i18npool/localedata/localedata_nb_NO \
+	CustomTarget/i18npool/localedata/localedata_nl_BE \
+	CustomTarget/i18npool/localedata/localedata_nl_NL \
+	CustomTarget/i18npool/localedata/localedata_nn_NO \
+	CustomTarget/i18npool/localedata/localedata_no_NO \
+	CustomTarget/i18npool/localedata/localedata_oc_FR \
+	CustomTarget/i18npool/localedata/localedata_pl_PL \
+	CustomTarget/i18npool/localedata/localedata_pt_BR \
+	CustomTarget/i18npool/localedata/localedata_pt_PT \
+	CustomTarget/i18npool/localedata/localedata_ro_RO \
+	CustomTarget/i18npool/localedata/localedata_rue_SK \
+	CustomTarget/i18npool/localedata/localedata_ru_RU \
+	CustomTarget/i18npool/localedata/localedata_sc_IT \
+	CustomTarget/i18npool/localedata/localedata_sh_ME \
+	CustomTarget/i18npool/localedata/localedata_sh_RS \
+	CustomTarget/i18npool/localedata/localedata_sh_YU \
+	CustomTarget/i18npool/localedata/localedata_sk_SK \
+	CustomTarget/i18npool/localedata/localedata_sl_SI \
+	CustomTarget/i18npool/localedata/localedata_sr_ME \
+	CustomTarget/i18npool/localedata/localedata_sr_RS \
+	CustomTarget/i18npool/localedata/localedata_sr_YU \
+	CustomTarget/i18npool/localedata/localedata_sv_FI \
+	CustomTarget/i18npool/localedata/localedata_sv_SE \
+	CustomTarget/i18npool/localedata/localedata_tr_TR \
+	CustomTarget/i18npool/localedata/localedata_uk_UA \
+	CustomTarget/i18npool/localedata/localedata_wa_BE \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -34,93 +34,93 @@ $(eval $(call gb_Library_add_linked_libs,localedata_others,\
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
-	CustomTarget/i18npool/source/localedata/localedata_af_NA \
-	CustomTarget/i18npool/source/localedata/localedata_af_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_ak_GH \
-	CustomTarget/i18npool/source/localedata/localedata_am_ET \
-	CustomTarget/i18npool/source/localedata/localedata_ar_DZ \
-	CustomTarget/i18npool/source/localedata/localedata_ar_EG \
-	CustomTarget/i18npool/source/localedata/localedata_ar_LB \
-	CustomTarget/i18npool/source/localedata/localedata_ar_OM \
-	CustomTarget/i18npool/source/localedata/localedata_ar_SA \
-	CustomTarget/i18npool/source/localedata/localedata_ar_TN \
-	CustomTarget/i18npool/source/localedata/localedata_az_AZ \
-	CustomTarget/i18npool/source/localedata/localedata_bn_IN \
-	CustomTarget/i18npool/source/localedata/localedata_bn_BD \
-	CustomTarget/i18npool/source/localedata/localedata_dz_BT \
-	CustomTarget/i18npool/source/localedata/localedata_ee_GH \
-	CustomTarget/i18npool/source/localedata/localedata_en_IN \
-	CustomTarget/i18npool/source/localedata/localedata_eo \
-	CustomTarget/i18npool/source/localedata/localedata_fa_IR \
-	CustomTarget/i18npool/source/localedata/localedata_gu_IN \
-	CustomTarget/i18npool/source/localedata/localedata_gug_PY \
-	CustomTarget/i18npool/source/localedata/localedata_haw_US \
-	CustomTarget/i18npool/source/localedata/localedata_ha_GH \
-	CustomTarget/i18npool/source/localedata/localedata_he_IL \
-	CustomTarget/i18npool/source/localedata/localedata_hi_IN \
-	CustomTarget/i18npool/source/localedata/localedata_hil_PH \
-	CustomTarget/i18npool/source/localedata/localedata_ht_HT \
-	CustomTarget/i18npool/source/localedata/localedata_hu_HU \
-	CustomTarget/i18npool/source/localedata/localedata_hy_AM \
-	CustomTarget/i18npool/source/localedata/localedata_ia \
-	CustomTarget/i18npool/source/localedata/localedata_id_ID \
-	CustomTarget/i18npool/source/localedata/localedata_ja_JP \
-	CustomTarget/i18npool/source/localedata/localedata_jbo \
-	CustomTarget/i18npool/source/localedata/localedata_kab_DZ \
-	CustomTarget/i18npool/source/localedata/localedata_kk_KZ \
-	CustomTarget/i18npool/source/localedata/localedata_km_KH \
-	CustomTarget/i18npool/source/localedata/localedata_kn_IN \
-	CustomTarget/i18npool/source/localedata/localedata_ko_KR \
-	CustomTarget/i18npool/source/localedata/localedata_ku_TR \
-	CustomTarget/i18npool/source/localedata/localedata_ky_KG \
-	CustomTarget/i18npool/source/localedata/localedata_lg_UG \
-	CustomTarget/i18npool/source/localedata/localedata_lif_NP \
-	CustomTarget/i18npool/source/localedata/localedata_ln_CD \
-	CustomTarget/i18npool/source/localedata/localedata_lo_LA \
-	CustomTarget/i18npool/source/localedata/localedata_mai_IN \
-	CustomTarget/i18npool/source/localedata/localedata_ml_IN \
-	CustomTarget/i18npool/source/localedata/localedata_mn_MN \
-	CustomTarget/i18npool/source/localedata/localedata_mr_IN \
-	CustomTarget/i18npool/source/localedata/localedata_ms_MY \
-	CustomTarget/i18npool/source/localedata/localedata_my_MM \
-	CustomTarget/i18npool/source/localedata/localedata_ne_NP \
-	CustomTarget/i18npool/source/localedata/localedata_nr_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_nso_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_om_ET \
-	CustomTarget/i18npool/source/localedata/localedata_or_IN \
-	CustomTarget/i18npool/source/localedata/localedata_pa_IN \
-	CustomTarget/i18npool/source/localedata/localedata_plt_MG \
-	CustomTarget/i18npool/source/localedata/localedata_pjt_AU \
-	CustomTarget/i18npool/source/localedata/localedata_pt_AO \
-	CustomTarget/i18npool/source/localedata/localedata_rw_RW \
-	CustomTarget/i18npool/source/localedata/localedata_sg_CF \
-	CustomTarget/i18npool/source/localedata/localedata_shs_CA \
-	CustomTarget/i18npool/source/localedata/localedata_so_SO \
-	CustomTarget/i18npool/source/localedata/localedata_ss_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_st_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_sw_TZ \
-	CustomTarget/i18npool/source/localedata/localedata_ta_IN \
-	CustomTarget/i18npool/source/localedata/localedata_te_IN \
-	CustomTarget/i18npool/source/localedata/localedata_tg_TJ \
-	CustomTarget/i18npool/source/localedata/localedata_th_TH \
-	CustomTarget/i18npool/source/localedata/localedata_ti_ER \
-	CustomTarget/i18npool/source/localedata/localedata_tk_TM \
-	CustomTarget/i18npool/source/localedata/localedata_tn_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_tpi_PG \
-	CustomTarget/i18npool/source/localedata/localedata_ts_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_ug_CN \
-	CustomTarget/i18npool/source/localedata/localedata_ur_PK \
-	CustomTarget/i18npool/source/localedata/localedata_uz_UZ \
-	CustomTarget/i18npool/source/localedata/localedata_ve_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_vi_VN \
-	CustomTarget/i18npool/source/localedata/localedata_xh_ZA \
-	CustomTarget/i18npool/source/localedata/localedata_yi_US \
-	CustomTarget/i18npool/source/localedata/localedata_zh_CN \
-	CustomTarget/i18npool/source/localedata/localedata_zh_HK \
-	CustomTarget/i18npool/source/localedata/localedata_zh_MO \
-	CustomTarget/i18npool/source/localedata/localedata_zh_SG \
-	CustomTarget/i18npool/source/localedata/localedata_zh_TW \
-	CustomTarget/i18npool/source/localedata/localedata_zu_ZA \
+	CustomTarget/i18npool/localedata/localedata_af_NA \
+	CustomTarget/i18npool/localedata/localedata_af_ZA \
+	CustomTarget/i18npool/localedata/localedata_ak_GH \
+	CustomTarget/i18npool/localedata/localedata_am_ET \
+	CustomTarget/i18npool/localedata/localedata_ar_DZ \
+	CustomTarget/i18npool/localedata/localedata_ar_EG \
+	CustomTarget/i18npool/localedata/localedata_ar_LB \
+	CustomTarget/i18npool/localedata/localedata_ar_OM \
+	CustomTarget/i18npool/localedata/localedata_ar_SA \
+	CustomTarget/i18npool/localedata/localedata_ar_TN \
+	CustomTarget/i18npool/localedata/localedata_az_AZ \
+	CustomTarget/i18npool/localedata/localedata_bn_IN \
+	CustomTarget/i18npool/localedata/localedata_bn_BD \
+	CustomTarget/i18npool/localedata/localedata_dz_BT \
+	CustomTarget/i18npool/localedata/localedata_ee_GH \
+	CustomTarget/i18npool/localedata/localedata_en_IN \
+	CustomTarget/i18npool/localedata/localedata_eo \
+	CustomTarget/i18npool/localedata/localedata_fa_IR \
+	CustomTarget/i18npool/localedata/localedata_gu_IN \
+	CustomTarget/i18npool/localedata/localedata_gug_PY \
+	CustomTarget/i18npool/localedata/localedata_haw_US \
+	CustomTarget/i18npool/localedata/localedata_ha_GH \
+	CustomTarget/i18npool/localedata/localedata_he_IL \
+	CustomTarget/i18npool/localedata/localedata_hi_IN \
+	CustomTarget/i18npool/localedata/localedata_hil_PH \
+	CustomTarget/i18npool/localedata/localedata_ht_HT \
+	CustomTarget/i18npool/localedata/localedata_hu_HU \
+	CustomTarget/i18npool/localedata/localedata_hy_AM \
+	CustomTarget/i18npool/localedata/localedata_ia \
+	CustomTarget/i18npool/localedata/localedata_id_ID \
+	CustomTarget/i18npool/localedata/localedata_ja_JP \
+	CustomTarget/i18npool/localedata/localedata_jbo \
+	CustomTarget/i18npool/localedata/localedata_kab_DZ \
+	CustomTarget/i18npool/localedata/localedata_kk_KZ \
+	CustomTarget/i18npool/localedata/localedata_km_KH \
+	CustomTarget/i18npool/localedata/localedata_kn_IN \
+	CustomTarget/i18npool/localedata/localedata_ko_KR \
+	CustomTarget/i18npool/localedata/localedata_ku_TR \
+	CustomTarget/i18npool/localedata/localedata_ky_KG \
+	CustomTarget/i18npool/localedata/localedata_lg_UG \
+	CustomTarget/i18npool/localedata/localedata_lif_NP \
+	CustomTarget/i18npool/localedata/localedata_ln_CD \
+	CustomTarget/i18npool/localedata/localedata_lo_LA \
+	CustomTarget/i18npool/localedata/localedata_mai_IN \
+	CustomTarget/i18npool/localedata/localedata_ml_IN \
+	CustomTarget/i18npool/localedata/localedata_mn_MN \
+	CustomTarget/i18npool/localedata/localedata_mr_IN \
+	CustomTarget/i18npool/localedata/localedata_ms_MY \
+	CustomTarget/i18npool/localedata/localedata_my_MM \
+	CustomTarget/i18npool/localedata/localedata_ne_NP \
+	CustomTarget/i18npool/localedata/localedata_nr_ZA \
+	CustomTarget/i18npool/localedata/localedata_nso_ZA \
+	CustomTarget/i18npool/localedata/localedata_om_ET \
+	CustomTarget/i18npool/localedata/localedata_or_IN \
+	CustomTarget/i18npool/localedata/localedata_pa_IN \
+	CustomTarget/i18npool/localedata/localedata_plt_MG \
+	CustomTarget/i18npool/localedata/localedata_pjt_AU \
+	CustomTarget/i18npool/localedata/localedata_pt_AO \
+	CustomTarget/i18npool/localedata/localedata_rw_RW \
+	CustomTarget/i18npool/localedata/localedata_sg_CF \
+	CustomTarget/i18npool/localedata/localedata_shs_CA \
+	CustomTarget/i18npool/localedata/localedata_so_SO \
+	CustomTarget/i18npool/localedata/localedata_ss_ZA \
+	CustomTarget/i18npool/localedata/localedata_st_ZA \
+	CustomTarget/i18npool/localedata/localedata_sw_TZ \
+	CustomTarget/i18npool/localedata/localedata_ta_IN \
+	CustomTarget/i18npool/localedata/localedata_te_IN \
+	CustomTarget/i18npool/localedata/localedata_tg_TJ \
+	CustomTarget/i18npool/localedata/localedata_th_TH \
+	CustomTarget/i18npool/localedata/localedata_ti_ER \
+	CustomTarget/i18npool/localedata/localedata_tk_TM \
+	CustomTarget/i18npool/localedata/localedata_tn_ZA \
+	CustomTarget/i18npool/localedata/localedata_tpi_PG \
+	CustomTarget/i18npool/localedata/localedata_ts_ZA \
+	CustomTarget/i18npool/localedata/localedata_ug_CN \
+	CustomTarget/i18npool/localedata/localedata_ur_PK \
+	CustomTarget/i18npool/localedata/localedata_uz_UZ \
+	CustomTarget/i18npool/localedata/localedata_ve_ZA \
+	CustomTarget/i18npool/localedata/localedata_vi_VN \
+	CustomTarget/i18npool/localedata/localedata_xh_ZA \
+	CustomTarget/i18npool/localedata/localedata_yi_US \
+	CustomTarget/i18npool/localedata/localedata_zh_CN \
+	CustomTarget/i18npool/localedata/localedata_zh_HK \
+	CustomTarget/i18npool/localedata/localedata_zh_MO \
+	CustomTarget/i18npool/localedata/localedata_zh_SG \
+	CustomTarget/i18npool/localedata/localedata_zh_TW \
+	CustomTarget/i18npool/localedata/localedata_zu_ZA \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -28,8 +28,6 @@

 $(eval $(call gb_Library_Library,textconv_dict))

-$(eval $(call gb_Library_add_package_headers,textconv_dict,i18npool_generated))
-
 $(eval $(call gb_Library_set_include,textconv_dict,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/i18npool/inc \
@@ -45,7 +43,8 @@ $(eval $(call gb_Library_add_linked_libs,textconv_dict,\
 ))

 $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
-	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/textconversion/*.cxx))) \
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\
+		CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \
 ))

 # vim: set noet sw=4 ts=4:
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -29,6 +29,11 @@
 $(eval $(call gb_Module_Module,i18npool))

 $(eval $(call gb_Module_add_targets,i18npool,\
+	CustomTarget_breakiterator \
+	CustomTarget_collator \
+	CustomTarget_indexentry \
+	CustomTarget_localedata \
+	CustomTarget_textconversion \
 	Library_collator_data \
 	Library_dict_ja \
 	Library_dict_zh \
@@ -41,7 +46,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\
 	Library_localedata_euro \
 	Library_localedata_others \
 	Library_textconv_dict \
-	Package_generated \
 	Package_inc \
 	Package_xml \
 ))

--- a/i18npool/Package_generated.mk
+++ b/i18npool/Package_generated.mk
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,i18npool_generated,$(WORKDIR)/i18npool/source))
-
-
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/breakiterator))
-$(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/breakiterator,\
-	i18npool/source/breakiterator/data/*.txt \
-	i18npool/source/breakiterator/data/ja.dic \
-	i18npool/source/breakiterator/data/zh.dic \
-))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/breakiterator,\
-	$(call gb_Executable_get_target_for_build,gendict) \
-))
-
-
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/collator))
-$(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/collator,\
-	i18npool/source/collator/data/*.txt \
-))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/collator,\
-	$(call gb_Executable_get_target_for_build,gencoll_rule) \
-))
-
-
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/indexentry))
-$(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/indexentry,\
-	i18npool/source/indexentry/data/*.txt \
-))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/indexentry,\
-	$(call gb_Executable_get_target_for_build,genindex_data) \
-))
-
-
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/localedata))
-$(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/localedata,\
-	i18npool/source/localedata/data/*.xml \
-))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/localedata,\
-	$(call gb_Executable_get_target_for_build,saxparser) \
-	$(call gb_ComponentTarget_get_outdir_inbuild_target,sax/source/expatwrap/expwrap) \
-	$(gb_XSLTPROCTARGET) \
-	$(OUTDIR)/bin/types.rdb \
-))
-
-
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/textconversion))
-$(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/textconversion,\
-	i18npool/source/textconversion/data/*.dic \
-))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/textconversion,\
-	$(call gb_Executable_get_target_for_build,genconv_dict) \
-))
-
-# vim: set noet sw=4 ts=4: