diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-02 14:43:26 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:04 +0100 |
| commit | 098bb4d484b0edd3c1672738c506020f15b808ee (patch) | |
| tree | e8cec9fc60e5ac124bf890c802306bf3c44488f0 /i18npool | |
| parent | add missing modules to RepositoryModule_ooo.mk (diff) | |
| download | core-098bb4d484b0edd3c1672738c506020f15b808ee.tar.gz core-098bb4d484b0edd3c1672738c506020f15b808ee.zip | |
use gbuild_simple.mk in i18npool
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/breakiterator/Makefile | 10 | ||||
| -rw-r--r-- | i18npool/source/collator/Makefile | 4 | ||||
| -rw-r--r-- | i18npool/source/indexentry/Makefile | 4 | ||||
| -rwxr-xr-x | i18npool/source/localedata/Makefile | 8 | ||||
| -rwxr-xr-x | i18npool/source/textconversion/Makefile | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile index 9f1a6ce56481..b34217a91139 100644 --- a/i18npool/source/breakiterator/Makefile +++ b/i18npool/source/breakiterator/Makefile @@ -39,25 +39,25 @@ data/dict_%.cxx : data/dict_%_invis.cxx data/dict_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.dic data ifeq ($(OS_FOR_BUILD),WNT) - $(gb_Helper_execute)gendict `cygpath -m $<` $@ + $(call gb_Helper_execute,gendict `cygpath -m $<` $@) else - $(gb_Helper_execute)gendict $< $@ + $(call gb_Helper_execute,gendict $< $@) endif ifeq ($(SYSTEM_GENBRK),) -GENBRK := $(gb_Helper_execute)genbrk +GENBRK := $(call gb_Helper_execute,genbrk) else GENBRK := $(SYSTEM_GENBRK) endif ifeq ($(SYSTEM_GENCCODE),) -GENCCODE := $(gb_Helper_execute)genccode +GENCCODE := $(call gb_Helper_execute,genccode) else GENCCODE := $(SYSTEM_GENCCODE) endif ifeq ($(SYSTEM_GENCMN),) -GENCMN := $(gb_Helper_execute)gencmn +GENCMN := $(call gb_Helper_execute,gencmn) else GENCMN := $(SYSTEM_GENCMN) endif diff --git a/i18npool/source/collator/Makefile b/i18npool/source/collator/Makefile index 2c2c891e973a..fb9a8dc48964 100644 --- a/i18npool/source/collator/Makefile +++ b/i18npool/source/collator/Makefile @@ -37,9 +37,9 @@ collator_%.cxx : collator_%_invis.cxx collator_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/%.txt ifeq ($(OS_FOR_BUILD),WNT) - $(gb_Helper_execute)gencoll_rule `cygpath -m $<` $@ $* + $(call gb_Helper_execute,gencoll_rule `cygpath -m $<` $@ $*) else - $(gb_Helper_execute)gencoll_rule $< $@ $* + $(call gb_Helper_execute,gencoll_rule $< $@ $*) endif lrl_include.hxx : $(txtlist) diff --git a/i18npool/source/indexentry/Makefile b/i18npool/source/indexentry/Makefile index cb0212cf9c8e..dac5c271cf41 100644 --- a/i18npool/source/indexentry/Makefile +++ b/i18npool/source/indexentry/Makefile @@ -36,9 +36,9 @@ include $(GBUILDDIR)/gbuild_simple.mk %_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/indexentry/data)/%.txt ifeq ($(OS_FOR_BUILD),WNT) - $(gb_Helper_execute)genindex_data `cygpath -m $<` $@ $* + $(call gb_Helper_execute,genindex_data `cygpath -m $<` $@ $*) else - $(gb_Helper_execute)genindex_data $< $@ $* + $(call gb_Helper_execute,genindex_data $< $@ $*) endif .PHONY: all diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index 336eb67ecaf9..618db65e8bc9 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -40,15 +40,15 @@ localedata_%.cxx : localedata_%_invis.cxx ifeq ($(OS_FOR_BUILD),WNT) localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ $(OUTDIR)/bin/saxparser$(gb_Executable_EXT) - $(gb_Helper_execute)saxparser $* `cygpath -m $<` $@ \ + $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ - -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` + -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`) else localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build) - $(gb_Helper_execute)saxparser $* $< $@ \ + $(call gb_Helper_execute,saxparser $* $< $@ \ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ - -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib + -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib) endif saxparser.rdb : saxparser.input diff --git a/i18npool/source/textconversion/Makefile b/i18npool/source/textconversion/Makefile index 97e0e2d550c4..872c099afefa 100755 --- a/i18npool/source/textconversion/Makefile +++ b/i18npool/source/textconversion/Makefile @@ -36,9 +36,9 @@ include $(GBUILDDIR)/gbuild_simple.mk %_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/textconversion/data)/%.dic ifeq ($(OS_FOR_BUILD),WNT) - $(gb_Helper_execute)genconv_dict $* `cygpath -m $<` $@ + $(call gb_Helper_execute,genconv_dict $* `cygpath -m $<` $@) else - $(gb_Helper_execute)genconv_dict $* $< $@ + $(call gb_Helper_execute,genconv_dict $* $< $@) endif |