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 /vcl | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/CustomTarget_afm_hash.mk | 9 | ||||
| -rw-r--r-- | vcl/CustomTarget_kde4_moc.mk | 9 | ||||
| -rw-r--r-- | vcl/CustomTarget_kde_moc.mk | 9 |
3 files changed, 14 insertions, 13 deletions
diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk index 23cc4ca20133..e8a9b5ca99b9 100644 --- a/vcl/CustomTarget_afm_hash.mk +++ b/vcl/CustomTarget_afm_hash.mk @@ -25,11 +25,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager)) -VCFM := $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager) +$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : \ + $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp -$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : $(VCFM)/afm_hash.hpp - -$(VCFM)/afm_hash.hpp : $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list | $(VCFM)/.dir +$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \ + $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \ + | $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@ diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk index bd887e582227..fc2555a9654b 100644 --- a/vcl/CustomTarget_kde4_moc.mk +++ b/vcl/CustomTarget_kde4_moc.mk @@ -27,11 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4)) -VCKM := $(call gb_CustomTarget_get_workdir,vcl/unx/kde4) +$(call gb_CustomTarget_get_target,vcl/unx/kde4) : \ + $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc -$(call gb_CustomTarget_get_target,vcl/unx/kde4) : $(VCKM)/KDEXLib.moc - -$(VCKM)/KDEXLib.moc : $(SRCDIR)/vcl/unx/kde4/KDEXLib.hxx | $(VCKM)/.dir +$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc : \ + $(SRCDIR)/vcl/unx/kde4/KDEXLib.hxx \ + | $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) $(MOC4) $< -o $@ diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk index 85a65ea3fdf9..d0c26e2e6858 100644 --- a/vcl/CustomTarget_kde_moc.mk +++ b/vcl/CustomTarget_kde_moc.mk @@ -27,13 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker)) -VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker) - $(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \ - $(VCKF)/kdefilepicker.moc.cxx + $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx -$(VCKF)/kdefilepicker.moc.cxx : \ - $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir +$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\ + $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \ + | $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) $(MOC) -o $@ $< |