add the module oox into tail_build's fold

10 files changed, 18 insertions, 7 deletions

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ad1a60aed7a7..384ebf2e8810 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     formula \
     hwpfilter \
     lotuswordpro \
+    oox \
     padmin \
     reportdesign \
     sc \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f80f67024b1a..42f16c91253f 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -30,6 +30,9 @@ $(eval $(call gb_Library_Library,oox))
 
 $(eval $(call gb_Library_add_package_headers,oox,\
     oox_inc \
+    oox_generated \
+    oox_source \
+    oox_tokens \
 ))
 
 $(eval $(call gb_Library_set_include,oox,\
@@ -340,6 +343,10 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
 $(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/namespaces.hxx
 $(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/properties.hxx
 $(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/tokens.hxx
+$(call gb_Package_get_target,oox_inc) : $(call gb_Package_get_target,oox_source)
+$(call gb_Package_get_target,oox_inc) : $(call gb_Package_get_target,oox_generated)
+
+
 
 $(call gb_CxxObject_get_target,oox/source/token/tokenmap) : $(oox_INC)/tokenhash.inc
 
diff --git a/oox/Package_source.mk b/oox/Package_source.mk
index fd27b48b5755..9a4e9613fd73 100644
--- a/oox/Package_source.mk
+++ b/oox/Package_source.mk
@@ -27,6 +27,6 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,oox_source,$(SRCDIR)/oox/source))
-$(eval $(call gb_Package_add_file,oox_source,inc/oox/token/tokens.txt,token/tokens.txt))
+$(eval $(call gb_Package_add_file,oox_source,inc/oox/tokens.txt,token/tokens.txt))
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4a612acec8e7..7a35ac8c695d 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index ce6cee1664ee..e6958f4cd487 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_include,scfilt,\
         -I$(realpath $(SRCDIR)/sc/inc/pch) \
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
+        -I$(WORKDIR)/oox/inc/ \
         -I$(OUTDIR)/inc \
 ))
 
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index cc0701abc189..9dd3f2975a68 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_set_include,sdfilt,\
     -I$(realpath $(SRCDIR)/sd/inc) \
     -I$(realpath $(SRCDIR)/sd/inc/pch) \
     -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/oox/inc/ \
 ))
 
 $(eval $(call gb_Library_add_defs,sdfilt,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 2f395e1bff19..3266e50a4dfa 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_set_include,msword,\
     -I$(WORKDIR)/inc/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
+    -I$(WORKDIR)/oox/inc/ \
     -I$(OUTDIR)/inc/sw \
 ))
 
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index bb405498c624..a26800005b1b 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl writerperfect xmlscript  NULL
+tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl writerperfect xmlscript  NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index 3a7b8ceb79d5..ec88aff308a5 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -35,8 +35,8 @@ $(eval $(call \
 $(eval $(call \
 	gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
 		$(gb_XSLTPROCTARGET) \
-		$(OUTDIR)/inc$(UPDMINOREXT)/oox/tokens.txt \
-		$(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt \
+		$(OUTDIR)/inc/oox/tokens.txt \
+		$(OUTDIR)/inc/oox/namespaces.txt \
 ))
 
 $(eval $(call \
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index b50ff5df4aa2..8b8b962d36c2 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -89,8 +89,8 @@ wf_GEN_ooxml_GperfFastToken_hxx=gperffasttoken.hxx
 wf_GEN_ooxml_Model_processed=model_preprocessed.xml
 wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml
 
-$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
-	cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc/oox/tokens.txt
+	cat $(OUTDIR)/inc/oox/tokens.txt \
 	| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
 
 $(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter