diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-24 14:56:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-24 18:01:08 +0200 |
| commit | 14a57d9c8b6296997907513877c72cde60ee724d (patch) | |
| tree | 868669ae61f4e04b2df52c12cbf6392b3fe9f0c6 /oox | |
| parent | 549f0f50b03883bb56a5c20dca2decd57083eafa (diff) | |
oox: generate vmlexport-shape-types into CustomTarget dir
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/CustomTarget_generated.mk | 14 | ||||
| -rw-r--r-- | oox/Library_oox.mk | 2 |
2 files changed, 8 insertions, 8 deletions
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 \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 8f25d9f5b3af..2301fd7cce2c 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -291,7 +291,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\ )) $(eval $(call gb_Library_add_generated_exception_objects,oox,\ - oox/source/export/vmlexport-shape-types \ + CustomTarget/oox/generated/misc/vmlexport-shape-types \ )) # vim: set noet sw=4 ts=4: |