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 /sdext | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/CustomTarget_pdfimport.mk | 10 | ||||
| -rw-r--r-- | sdext/CustomTarget_presenter.mk | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk index c5fae4a3b93d..81603f5ad778 100644 --- a/sdext/CustomTarget_pdfimport.mk +++ b/sdext/CustomTarget_pdfimport.mk @@ -27,12 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport)) -SEPI := $(call gb_CustomTarget_get_workdir,sdext/pdfimport) +$(call gb_CustomTarget_get_target,sdext/pdfimport) : \ + $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx -$(call gb_CustomTarget_get_target,sdext/pdfimport) : $(SEPI)/hash.cxx - -$(SEPI)/hash.cxx : $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \ - | $(SEPI)/.dir +$(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \ + $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \ + | $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@ diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk index 5b6188107f14..afecd49f763a 100644 --- a/sdext/CustomTarget_presenter.mk +++ b/sdext/CustomTarget_presenter.mk @@ -27,16 +27,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)) -SEPR := $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) - $(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ - $(SEPR)/presenter.xhp + $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp include $(SRCDIR)/sdext/platform.mk -$(SEPR)/presenter.xhp : \ +$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ - | $(SEPR)/.dir + | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@ |