diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-08 14:14:46 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-13 16:26:10 +0100 |
| commit | bdfdd054bd25714f9c52c974f22228bee4bfbe67 (patch) | |
| tree | 5d52309c4d07614d1e555af2e010544cdb3994a1 /i18npool | |
| parent | 3909015f5dd1cbd18de80f38cd1fe675b7c59b7e (diff) | |
more subtle dependencies for cross-compilation
Now we build only what we really need for 'build' platform - there is
new build-tools make target.
The list of tools is in solenv/gbuild/extensions/pre_BuildTools.mk.
Also similar is done to some extent for 'host' platform using
gb_Module_add_targets_for_build which is ignored for 'host'.
Change-Id: I6acd1762b16aca366aac1a0688500f27869cfca2
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 24 | ||||
| -rw-r--r-- | i18npool/Module_i18npool.mk | 4 |
2 files changed, 16 insertions, 12 deletions
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 824cfde49801..82841261092f 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -30,23 +30,29 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata)) i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata) +i18npool_LD_NAMES := $(basename $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) + $(call gb_CustomTarget_get_target,i18npool/localedata) : \ - $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \ - $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) + $(foreach name,$(i18npool_LD_NAMES),$(i18npool_LDDIR)/localedata_$(name).cxx) -$(i18npool_LDDIR)/localedata_%.cxx : \ - $(SRCDIR)/i18npool/source/localedata/data/%.xml \ +define i18npool_LD_RULE +$(i18npool_LDDIR)/localedata_$(1).cxx : \ + $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \ $(i18npool_LDDIR)/saxparser.rdb \ $(call gb_Executable_get_runtime_dependencies,saxparser) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) - $(call gb_Helper_abbreviate_dirs, \ - $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ + $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1) + $$(call gb_Helper_abbreviate_dirs, \ + $(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ $(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ - sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ - rm $@.tmp) + sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \ + rm $$@.tmp) + +endef + +$(foreach name,$(i18npool_LD_NAMES),$(eval $(call i18npool_LD_RULE,$(name)))) $(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ $(SOLARENV)/bin/packcomponents.xslt \ diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index a8f211848bf5..9eb5c31f4c4b 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -49,15 +49,13 @@ $(eval $(call gb_Module_add_targets,i18npool,\ Package_inc \ )) -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_Module_add_targets,i18npool,\ +$(eval $(call gb_Module_add_targets_for_build,i18npool,\ Executable_gencoll_rule \ Executable_genconv_dict \ Executable_gendict \ Executable_genindex_data \ Executable_saxparser \ )) -endif $(eval $(call gb_Module_add_check_targets,i18npool,\ CppunitTest_i18npool_test_breakiterator \ |