diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-09 09:38:39 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2012-05-09 09:39:19 +0100 |
commit | 736170293c1cb9b242a13c6d8cda4e23bf465b3b (patch) | |
tree | b190c81c2cf5f45c725014e7b6089dbdd5173cfc /i18npool | |
parent | gbuild: use mixed paths on cygwin (diff) | |
download | core-736170293c1cb9b242a13c6d8cda4e23bf465b3b.tar.gz core-736170293c1cb9b242a13c6d8cda4e23bf465b3b.zip |
gbuild: remove gb_Helper_abbreviate_dirs_native
Change-Id: I0a3ad6553692fc21eaf96cf35e9c343b4d716c21
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 | 4 | ||||
-rw-r--r-- | i18npool/CustomTarget_textconversion.mk | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 54f5a4b543f4..55c655401a27 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ $(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_abbreviate_dirs,\ $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(IPBI)/dict_%.cxx,%,$@)) ifeq ($(SYSTEM_GENBRK),) @@ -72,7 +72,7 @@ BRKFILES := $(subst .txt,.brk,$(notdir \ # 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,\ + $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(shell $(gb_MKTEMP)) && \ $(foreach brk,$(BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \ $(GENCMN) -n OpenOffice -t tmp -S -d $(IPBI)/ 0 $${RESPONSEFILE} && \ @@ -84,13 +84,13 @@ $(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCM $(IPBI)/%_brk.c : $(IPBI)/%.brk $(GENCCODETARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ $(GENCCODE) -n OpenOffice -d $(IPBI)/ $< \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) $(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ $(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 951a2cab36d3..413767ca13b2 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -38,7 +38,7 @@ $(call gb_CustomTarget_get_target,i18npool/collator) : \ $(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_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) $(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk index 681dd4c1e6e7..1968fb6c65ca 100644 --- a/i18npool/CustomTarget_indexentry.mk +++ b/i18npool/CustomTarget_indexentry.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/indexentry) : \ $(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_abbreviate_dirs, \ $(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \ sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index e506d465b6c7..c4e8dc9c2b2e 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \ $(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_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \ $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \ @@ -49,7 +49,7 @@ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(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, \ + $(call gb_Helper_abbreviate_dirs, \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk index da58b1b33a54..6a5f10d79468 100644 --- a/i18npool/CustomTarget_textconversion.mk +++ b/i18npool/CustomTarget_textconversion.mk @@ -37,7 +37,7 @@ $(call gb_CustomTarget_get_target,i18npool/textconversion) : \ $(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_abbreviate_dirs, \ $(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \ sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) |