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_localedata.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_localedata.mk')
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index c4e8dc9c2b2e..d63d3e49c7a0 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -28,32 +28,33 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata)) -IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata) +i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata) $(call gb_CustomTarget_get_target,i18npool/localedata) : \ - $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \ + $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \ $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) -$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ - $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) +$(i18npool_LDDIR)/localedata_%.cxx : \ + $(SRCDIR)/i18npool/source/localedata/data/%.xml \ + $(i18npool_LDDIR)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ - $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \ + $(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \ $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) -$(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \ +$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1) $(call gb_Helper_abbreviate_dirs, \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) -$(IPLD)/saxparser.input :| $(IPLD)/.dir +$(i18npool_LDDIR)/saxparser.input :| $(i18npool_LDDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@ |