fix delivery of generated files

3 files changed, 35 insertions, 8 deletions

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 4c3db9ab9c4b..964ba398d029 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -366,17 +366,10 @@ $(eval $(call oox_GenTarget_GenTarget,namespaces,namespace,namespaces.txt))
 $(eval $(call oox_GenTarget_GenTarget,properties,property,))
 $(eval $(call oox_GenTarget_GenTarget,tokens,token,tokenhash.gperf))
 
-$(call gb_Package_get_target,oox_tokens) :| $(OUTDIR)/inc/oox/namespaces.txt
-$(call gb_Package_get_clean_target,oox_tokens) : oox_ns_clean
 $(call gb_Library_get_clean_target,oox) : oox_clean
 
 oox_clean :
 	rm -rf $(WORKDIR)/oox
-oox_ns_clean :
-	rm -rf $(OUTDIR)/inc/oox/namespaces.txt
-.PHONY: oox_clean oox_ns_clean
-
-$(OUTDIR)/inc/oox/namespaces.txt : $(oox_MISC)/namespaces.txt
-	cp $< $@
+.PHONY: oox_clean
 
 # vim: set noet ts=4 sw=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 453d9ad14c5e..9fc9c8eac3ee 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,oox))
 $(eval $(call gb_Module_add_targets,oox,\
     Library_oox \
     Package_inc \
+    Package_generated \
     Package_tokens \
 ))
 
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
new file mode 100644
index 000000000000..93639b883405
--- /dev/null
+++ b/oox/Package_generated.mk
@@ -0,0 +1,33 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/oox))
+
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
+$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
+
+# vim: set noet ts=4 sw=4: