diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-30 12:27:04 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-30 17:15:48 +0100 |
| commit | edf6730fd572788bac28f9fdeb84d25edfe04c0f (patch) | |
| tree | 933e13059c6330e3dbb40b339abc5e1751fff194 /i18npool | |
| parent | 0d6f8e5c048d3caef43bf26f2ae683224dec6921 (diff) | |
add runtime deps for custom targets
Change-Id: I49272003ea72c84c9e81bc826820b0ac5f9d5008
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CustomTarget_breakiterator.mk | 8 | ||||
| -rw-r--r-- | i18npool/CustomTarget_collator.mk | 2 | ||||
| -rw-r--r-- | i18npool/CustomTarget_indexentry.mk | 2 | ||||
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 8 | ||||
| -rw-r--r-- | i18npool/CustomTarget_textconversion.mk | 2 |
5 files changed, 5 insertions, 17 deletions
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 067c882b86aa..a8fe3bde7504 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -30,18 +30,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator)) i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator) -ifeq ($(SYSTEM_ICU),NO) -i18npool_ICUTARGET := $(call gb_ExternalPackage_get_target,icu) -else -i18npool_ICUTARGET := -endif - $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ $(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c $(i18npool_BIDIR)/dict_%.cxx : \ $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \ - $(call gb_Executable_get_target_for_build,gendict) $(i18npool_ICUTARGET) \ + $(call gb_Executable_get_runtime_dependencies,gendict) \ | $(i18npool_BIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) $(call gb_Helper_abbreviate_dirs,\ diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 2613f672f93e..c570d5a65e71 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -56,7 +56,7 @@ $(call gb_CustomTarget_get_target,i18npool/collator) : $(SRCDIR)/i18npool/Custom $(i18npool_CODIR)/collator_%.cxx : \ $(SRCDIR)/i18npool/source/collator/data/%.txt \ - $(call gb_Executable_get_target_for_build,gencoll_rule) \ + $(call gb_Executable_get_runtime_dependencies,gencoll_rule) \ | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) $(call gb_Helper_abbreviate_dirs, \ diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk index 03a8ff54b36a..bd78b6759b45 100644 --- a/i18npool/CustomTarget_indexentry.mk +++ b/i18npool/CustomTarget_indexentry.mk @@ -45,7 +45,7 @@ $(call gb_CustomTarget_get_target,i18npool/indexentry) : $(SRCDIR)/i18npool/Cust $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \ $(SRCDIR)/i18npool/source/indexentry/data/%.txt \ - $(call gb_Executable_get_target_for_build,genindex_data) \ + $(call gb_Executable_get_runtime_dependencies,genindex_data) \ | $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1) $(call gb_Helper_abbreviate_dirs, \ diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index c56603ad65c7..824cfde49801 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -34,16 +34,10 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \ $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \ $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) -# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required -# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc: $(i18npool_LDDIR)/localedata_%.cxx : \ $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(i18npool_LDDIR)/saxparser.rdb \ - $(call gb_UnoApiMerge_get_target_for_build,ure/types) \ - $(call gb_Executable_get_target_for_build,saxparser) \ - $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Package_get_target_for_build,cppuhelper_unorc) + $(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 \ diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk index 30dc2d767244..7846680c0e67 100644 --- a/i18npool/CustomTarget_textconversion.mk +++ b/i18npool/CustomTarget_textconversion.mk @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,i18npool/textconversion) : \ $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \ $(SRCDIR)/i18npool/source/textconversion/data/%.dic \ - $(call gb_Executable_get_target_for_build,genconv_dict) \ + $(call gb_Executable_get_runtime_dependencies,genconv_dict) \ | $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1) $(call gb_Helper_abbreviate_dirs, \ |