oox: generate vmlexport-shape-types into CustomTarget dir

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 \

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: