diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
| commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
| tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /i18npool/CustomTarget_collator.mk | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'i18npool/CustomTarget_collator.mk')
| -rw-r--r-- | i18npool/CustomTarget_collator.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 413767ca13b2..95cf190632a3 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -28,22 +28,25 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator)) -IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator) -TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)) +i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator) +i18npool_COTXTS := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)) $(call gb_CustomTarget_get_target,i18npool/collator) : \ - $(IPCO)/lrl_include.hxx $(foreach txt,$(TXTLIST), \ - $(patsubst %.txt,$(IPCO)/collator_%.cxx,$(txt))) + $(i18npool_CODIR)/lrl_include.hxx $(foreach txt,$(i18npool_COTXTS), \ + $(patsubst %.txt,$(i18npool_CODIR)/collator_%.cxx,$(txt))) -$(IPCO)/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt \ - $(call gb_Executable_get_target_for_build,gencoll_rule) | $(IPCO)/.dir +$(i18npool_CODIR)/collator_%.cxx : \ + $(SRCDIR)/i18npool/source/collator/data/%.txt \ + $(call gb_Executable_get_target_for_build,gencoll_rule) \ + | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) -$(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir +$(i18npool_CODIR)/lrl_include.hxx : \ + $(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(TXTLIST), \ + echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \ $(firstword $(subst _, ,$(txt)))))"' > $@ # vim: set noet sw=4 ts=4: |