summaryrefslogtreecommitdiff
path: root/sw/Module_sw.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2016-12-29 23:42:23 +0100
committerMatúš Kukan <matus@libreoffice.org>2016-12-30 07:16:03 +0000
commitd8a9d483898d94868bc502d52f0fcd166d18959f (patch)
treea423441fcdd9ec53285926a435c05d23595642ab /sw/Module_sw.mk
parentbd9009bdadb2a35c0271f7c12384bb96831a9bf3 (diff)
Workaround strange sw test makefiles
Include ooxmlexport_setup.mk only once in Module_sw.mk, so that gbuildtojson can properly set last included makefile for test jsons. Change-Id: Ie8ed3296ae97cf4a33d652599673f389b224993e Reviewed-on: https://gerrit.libreoffice.org/32502 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Diffstat (limited to 'sw/Module_sw.mk')
-rw-r--r--sw/Module_sw.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 3b5d06f59e38..04d33eebb4d4 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -17,6 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+include $(SRCDIR)/sw/ooxmlexport_setup.mk
+
$(eval $(call gb_Module_Module,sw))
$(eval $(call gb_Module_add_targets,sw,\