From d8a9d483898d94868bc502d52f0fcd166d18959f Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 29 Dec 2016 23:42:23 +0100 Subject: Workaround strange sw test makefiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Matúš Kukan --- sw/CppunitTest_sw_ooxmlexport.mk | 2 -- sw/CppunitTest_sw_ooxmlexport2.mk | 2 -- sw/CppunitTest_sw_ooxmlexport3.mk | 2 -- sw/CppunitTest_sw_ooxmlexport4.mk | 2 -- sw/CppunitTest_sw_ooxmlexport5.mk | 2 -- sw/CppunitTest_sw_ooxmlexport6.mk | 2 -- sw/CppunitTest_sw_ooxmlexport7.mk | 2 -- sw/CppunitTest_sw_ooxmlexport9.mk | 2 -- sw/CppunitTest_sw_ooxmlfieldexport.mk | 2 -- sw/CppunitTest_sw_ooxmlw14export.mk | 2 -- sw/Module_sw.mk | 2 ++ 11 files changed, 2 insertions(+), 20 deletions(-) (limited to 'sw') diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk index d3e7ac11b268..dec6978e9aff 100644 --- a/sw/CppunitTest_sw_ooxmlexport.mk +++ b/sw/CppunitTest_sw_ooxmlexport.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - # empty second argument (i.e. no 1) $(eval $(call sw_ooxmlexport_test,)) diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk b/sw/CppunitTest_sw_ooxmlexport2.mk index 2be67c041f3f..18a3456b5dfe 100644 --- a/sw/CppunitTest_sw_ooxmlexport2.mk +++ b/sw/CppunitTest_sw_ooxmlexport2.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,2)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk b/sw/CppunitTest_sw_ooxmlexport3.mk index cdb9ab1d2994..5969aea55484 100644 --- a/sw/CppunitTest_sw_ooxmlexport3.mk +++ b/sw/CppunitTest_sw_ooxmlexport3.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,3)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk b/sw/CppunitTest_sw_ooxmlexport4.mk index 1a92a489cff6..e3285932e004 100644 --- a/sw/CppunitTest_sw_ooxmlexport4.mk +++ b/sw/CppunitTest_sw_ooxmlexport4.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,4)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk b/sw/CppunitTest_sw_ooxmlexport5.mk index 42b873e8ca39..674fceeb70bc 100644 --- a/sw/CppunitTest_sw_ooxmlexport5.mk +++ b/sw/CppunitTest_sw_ooxmlexport5.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,5)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport6.mk b/sw/CppunitTest_sw_ooxmlexport6.mk index f619ada6c144..9b3ebe18146c 100644 --- a/sw/CppunitTest_sw_ooxmlexport6.mk +++ b/sw/CppunitTest_sw_ooxmlexport6.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,6)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport7.mk b/sw/CppunitTest_sw_ooxmlexport7.mk index 8a8f53e0d0a8..2145a9463fcd 100644 --- a/sw/CppunitTest_sw_ooxmlexport7.mk +++ b/sw/CppunitTest_sw_ooxmlexport7.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,7)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport9.mk b/sw/CppunitTest_sw_ooxmlexport9.mk index 9b7c409271d0..e0143e56eb44 100644 --- a/sw/CppunitTest_sw_ooxmlexport9.mk +++ b/sw/CppunitTest_sw_ooxmlexport9.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call sw_ooxmlexport_test,9)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk index abd0653f6449..8c753950b161 100644 --- a/sw/CppunitTest_sw_ooxmlfieldexport.mk +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlfieldexport)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlfieldexport, \ diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index d54d3c12ca17..a12d9fe2270c 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -9,8 +9,6 @@ # #************************************************************************* -include $(SRCDIR)/sw/ooxmlexport_setup.mk - $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlw14export)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlw14export, \ 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,\ -- cgit