11 files changed, 17 insertions, 44 deletions
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 2d7b67c424bb..aca38ab6b3a6 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,oox/generated))
 
 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_INC := $(call gb_CustomTarget_get_workdir,oox/generated)
 oox_GENHEADERPATH := $(oox_INC)/oox/token
 
 $(oox_MISC)/vmlexport-shape-types.cxx : \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a8c95ee980f1..3d8743fe4f40 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -9,11 +9,6 @@
 
 $(eval $(call gb_Library_Library,oox))
 
-$(eval $(call gb_Library_use_packages,oox,\
-    oox_generated \
-    oox_tokens \
-))
-
 $(eval $(call gb_Library_set_precompiled_header,oox,$(SRCDIR)/oox/inc/pch/precompiled_oox))
 
 $(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
@@ -21,7 +16,6 @@ $(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
 $(eval $(call gb_Library_set_include,oox,\
     $$(INCLUDE) \
     -I$(SRCDIR)/oox/inc \
-    -I$(call gb_CustomTarget_get_workdir,oox/generated)/inc \
 ))
 
 ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64)
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 3de3f1a81719..c086254b9218 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -12,8 +12,6 @@ $(eval $(call gb_Module_Module,oox))
 $(eval $(call gb_Module_add_targets,oox,\
 	CustomTarget_generated \
     Library_oox \
-    Package_generated \
-    Package_tokens \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
deleted file mode 100644
index 69e8c904d570..000000000000
--- a/oox/Package_generated.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,oox_generated,$(call gb_CustomTarget_get_workdir,oox/generated)))
-
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,inc/oox/token/properties.hxx))
-$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk
deleted file mode 100644
index d79743b13de2..000000000000
--- a/oox/Package_tokens.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,oox_tokens,$(SRCDIR)/oox/source/token))
-
-$(eval $(call gb_Package_add_file,oox_tokens,inc/oox/tokens.txt,tokens.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index eb5ff86c2619..5b383c4dac72 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_set_include,scfilt,\
 $(eval $(call gb_Library_use_sdk_api,scfilt))
 
 $(eval $(call gb_Library_use_custom_headers,scfilt,\
+	oox/generated \
 	officecfg/registry \
 ))
 
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 144e38441d43..028226924c6a 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -22,6 +22,10 @@ endif
 
 $(eval $(call gb_Library_use_external,sdfilt,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,sdfilt,\
+	oox/generated \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sdfilt))
 
 $(eval $(call gb_Library_use_libraries,sdfilt,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 624a4845c5ce..56f0959f89ca 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,sm,\
 
 $(eval $(call gb_Library_use_external,sm,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,sm,oox/generated))
+
 $(eval $(call gb_Library_use_sdk_api,sm))
 
 $(eval $(call gb_Library_use_libraries,sm,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index a2b64e36640b..93a43d11802d 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,msword))
 
 $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
 
-$(eval $(call gb_Library_use_custom_headers,msword,writerfilter/source))
+$(eval $(call gb_Library_use_custom_headers,msword,\
+	oox/generated \
+	writerfilter/source \
+))
 
 $(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword))
 
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 903cf4f140d2..2c467edd10f6 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -61,7 +61,7 @@ writerfilter_ALL = \
 	$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \
 	$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \
 
-writerfilter_DEP_ooxml_Namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt
+writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt
 writerfilter_GEN_doctok_ResourceIds_hxx=$(writerfilter_WORK)/doctok/resourceids.hxx
 writerfilter_GEN_doctok_Resources_cxx=$(writerfilter_WORK)/resources.cxx
 writerfilter_GEN_doctok_Resources_hxx=$(writerfilter_WORK)/doctok/resources.hxx
@@ -187,9 +187,10 @@ $(writerfilter_GEN_ooxml_ResourceIds_hxx) : $(writerfilter_SRC_ooxml_ResourceIds
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
 	$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
 
-$(writerfilter_GEN_ooxml_Token_tmp) : $(OUTDIR)/inc/oox/tokens.txt | $(writerfilter_WORK)/.dir
+$(writerfilter_GEN_ooxml_Token_tmp) : $(SRCDIR)/oox/source/token/tokens.txt | $(writerfilter_WORK)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
-	sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" < $(OUTDIR)/inc/oox/tokens.txt > $@
+	sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" \
+		< $(SRCDIR)/oox/source/token/tokens.txt > $@
 
 $(writerfilter_GEN_ooxml_Token_xml) : $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 81d7df296b19..19935907c18a 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Library_Library,writerfilter))
 
 $(eval $(call gb_Library_use_custom_headers,writerfilter,\
+	oox/generated \
 	writerfilter/source \
 ))