diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-29 14:23:49 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-29 14:29:29 +0100 |
| commit | 27a66ce174d8c5c2947056cbf39533be55e14170 (patch) | |
| tree | 837ee8f4d8073c24700d4c6270f7d3984f8462ab | |
| parent | we use idxdict these days (diff) | |
| download | core-27a66ce174d8c5c2947056cbf39533be55e14170.tar.gz core-27a66ce174d8c5c2947056cbf39533be55e14170.zip | |
gendict is internal tool, not part of ICU
Change-Id: Ica89dc89663ed3fa611e36245732b296386b5bf7
| -rwxr-xr-x | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 16 | ||||
| -rw-r--r-- | i18npool/CustomTarget_breakiterator.mk | 10 |
3 files changed, 8 insertions, 19 deletions
diff --git a/Repository.mk b/Repository.mk index 5bf2c362373b..751d226a8b91 100755 --- a/Repository.mk +++ b/Repository.mk @@ -757,7 +757,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ genccode \ gencmn \ - gendict \ python \ ucpp \ xmllint \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 088a9a705e2c..4ae674563ee9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2588,20 +2588,4 @@ endef endif -ifeq ($(SYSTEM_ICU),YES) - -gb_ExternalExecutable__register_gendict := - -else - -define gb_ExternalExecutable__register_gendict -$(call gb_ExternalExecutable_set_internal,gendict) -$(call gb_ExternalExecutable_add_dependencies,gendict,\ - $(call gb_Package_get_target_for_build,icu) \ -) - -endef - -endif - # vim: set noet sw=4 ts=4: diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 636406bf8a56..f23dad0ee88a 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -30,16 +30,22 @@ $(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_ExternalExecutable_get_dependencies,gendict) \ + $(call gb_Executable_get_target_for_build,gendict) $(i18npool_ICUTARGET) \ | $(i18npool_BIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) $(call gb_Helper_abbreviate_dirs,\ - $(call gb_ExternalExecutable_get_command,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) i18npool_BRKTXTS := \ char_in.brk \ |