From a9550f63cd7a7e064901b2c997375ed384781eea Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 9 May 2012 23:15:42 +0200 Subject: normalize variable names in gbuild user makefiles Variables should have module name as prefix to prevent collisions. --- vcl/CustomTarget_afm_hash.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'vcl/CustomTarget_afm_hash.mk') 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" > $@ -- cgit v1.2.3