[Libreoffice-commits] core.git: dbaccess/Module_dbaccess.mk framework/Module_framework.mk sc/Module_sc.mk sfx2/Module_sfx2.mk svl/Module_svl.mk svtools/Module_svtools.mk svx/Module_svx.mk sw/Module_sw.mk unoxml/Module_unoxml.mk

[Jan-Marek Glogowski (via logerrit)]

 dbaccess/Module_dbaccess.mk   |    2 --
 framework/Module_framework.mk |    2 --
 sc/Module_sc.mk               |    2 --
 sfx2/Module_sfx2.mk           |    4 ----
 svl/Module_svl.mk             |    2 --
 svtools/Module_svtools.mk     |    2 --
 svx/Module_svx.mk             |    2 --
 sw/Module_sw.mk               |    4 ----
 unoxml/Module_unoxml.mk       |    2 --
 9 files changed, 22 deletions(-)

New commits:
commit e81414d39bdded7fefb733559656b7bd3458bbe5
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Sun Feb 16 21:00:57 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Feb 17 02:45:56 2020 +0100

    Drop needless junit and python make conditionals
    
    JunitTest and PythonTest modules check for these themself.
    
    Change-Id: Ia453bc99571738b01cc8f161f346cb6c37b2e429
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88832
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 50d601e853ae..a84bd57f2f82 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -83,13 +83,11 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
     JunitTest_dbaccess_unoapi \
 ))
 
-ifneq ($(DISABLE_PYTHON),TRUE)
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	PythonTest_dbaccess_python \
 ))
 endif
-endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,dbaccess,\
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 93ac5e79618f..8b136ac92dc7 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -37,11 +37,9 @@ $(eval $(call gb_Module_add_l10n_targets,framework,\
     AllLangMoTarget_fwk \
 ))
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
     JunitTest_framework_complex \
     JunitTest_framework_unoapi \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index d52537f1c908..a56b9d4c9f70 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -217,11 +217,9 @@ $(eval $(call gb_Module_add_perfcheck_targets,sc,\
 	CppunitTest_sc_tablesheetobj \
 ))
 
-ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	PythonTest_sc_python \
 ))
-endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,sc,\
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b3a1f061b853..8ebe54cef9c7 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -38,18 +38,14 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\
     CppunitTest_sfx2_classification \
 ))
 
-ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
     JunitTest_sfx2_complex \
     JunitTest_sfx2_unoapi \
 ))
-endif
 
-ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
 	PythonTest_sfx2_python \
 ))
-endif
 
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index 2569edb05b64..6283df82eadb 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -40,11 +40,9 @@ $(eval $(call gb_Module_add_check_targets,svl,\
 	CppunitTest_svl_urihelper \
 ))
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
     JunitTest_svl_complex \
 ))
-endif
 
 #todo: dde platform dependent
 #todo: package_inc
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index d51140366b20..33af7b52229c 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -43,11 +43,9 @@ endif
 
 endif
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
     JunitTest_svtools_unoapi \
 ))
-endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,svtools,\
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 48ab6bcb071d..c4d816e6fc5d 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -47,11 +47,9 @@ $(eval $(call gb_Module_add_targets,svx,\
 ))
 endif
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
     JunitTest_svx_unoapi \
 ))
-endif
 
 #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
 #todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 06611c2fc283..f8b250f57cbf 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -126,7 +126,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 ))
 endif
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
     JunitTest_sw_complex \
     JunitTest_sw_unoapi_1 \
@@ -134,13 +133,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
     JunitTest_sw_unoapi_3 \
     JunitTest_sw_unoapi_4 \
 ))
-endif
 
-ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 	PythonTest_sw_python \
 ))
-endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,sw,\
diff --git a/unoxml/Module_unoxml.mk b/unoxml/Module_unoxml.mk
index bb069531ff63..5008d828c13b 100644
--- a/unoxml/Module_unoxml.mk
+++ b/unoxml/Module_unoxml.mk
@@ -28,11 +28,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,unoxml,\
     CppunitTest_unoxml_domtest \
 ))
 
-ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
     JunitTest_unoxml_complex \
     JunitTest_unordf_complex \
 ))
-endif
 
 # vim: set noet sw=4 ts=4: