From 14a57d9c8b6296997907513877c72cde60ee724d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 24 May 2012 14:56:47 +0200 Subject: oox: generate vmlexport-shape-types into CustomTarget dir --- oox/CustomTarget_generated.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'oox/CustomTarget_generated.mk') diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index c2ad51161d35..bcdd5efb71d6 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -9,7 +9,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,oox/generated)) -$(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \ +oox_SRC := $(SRCDIR)/oox/source/token +oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc +oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc +oox_GENHEADERPATH := $(oox_INC)/oox/token + +$(oox_MISC)/vmlexport-shape-types.cxx : \ $(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \ $(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \ $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml @@ -17,11 +22,6 @@ $(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \ mkdir -p $(dir $@) perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@ -oox_SRC := $(SRCDIR)/oox/source/token -oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc -oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc -oox_GENHEADERPATH := $(oox_INC)/oox/token - $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf $(call gb_Output_announce,$@,build,GPF,1) $(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@ @@ -49,7 +49,7 @@ $(eval $(call oox_GenTarget,properties,property,)) $(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf)) $(call gb_CustomTarget_get_target,oox/generated) : \ - $(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) \ + $(oox_MISC)/vmlexport-shape-types.cxx \ $(oox_INC)/tokenhash.inc \ $(oox_INC)/tokennames.inc \ $(oox_INC)/namespacenames.inc \ -- cgit