diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-28 13:04:27 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-28 13:04:42 -0500 |
| commit | c4f444dc40a1e8429250996dc2b39200c91ea1ce (patch) | |
| tree | d4c90328a4bc237ed5368cbb27f3d505e654fe14 /i18npool | |
| parent | 4df5fceade2ff3d70e2ceee2cb77c5f7cb4f8b80 (diff) | |
fix icu deps again
Change-Id: Iecc35559cf77e844a84e1f058cb57c02d53493a2
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CustomTarget_breakiterator.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index fd9b98c4dd33..28d859663885 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -30,17 +30,18 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator)) i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator) -$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ - $(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c - ifeq ($(SYSTEM_ICU),NO) -$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ - $(call gb_ExternalPackage_get_target,icu) +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) \ + $(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,\ @@ -93,7 +94,7 @@ i18npool_BRKTXTS := \ # Output of gencmn is redirected to OpenOffice_tmp.c with the -t switch. $(i18npool_BIDIR)/OpenOffice_dat.c : $(SRCDIR)/i18npool/CustomTarget_breakiterator.mk \ $(patsubst %.brk,$(i18npool_BIDIR)/%_brk.c,$(i18npool_BRKTXTS)) \ - $(i18npool_GENCMNTARGET) + $(i18npool_GENCMNTARGET) $(i18npool_ICUTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1) $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(shell $(gb_MKTEMP)) && \ @@ -105,13 +106,13 @@ $(i18npool_BIDIR)/OpenOffice_dat.c : $(SRCDIR)/i18npool/CustomTarget_breakiterat echo '#endif' >> $@ && \ cat $(subst _dat,_tmp,$@) >> $@) -$(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(i18npool_GENCCODETARGET) +$(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(i18npool_GENCCODETARGET) $(i18npool_ICUTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1) $(call gb_Helper_abbreviate_dirs,\ $(i18npool_GENCCODE) -n OpenOffice -d $(i18npool_BIDIR)/ $< \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET) +$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET) $(i18npool_ICUTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1) $(call gb_Helper_abbreviate_dirs,\ $(i18npool_GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) |