From f9fb1e1abc2f6326e3c495e11eca7d64f8fdfc27 Mon Sep 17 00:00:00 2001 From: Tamas Bunth Date: Tue, 17 Sep 2019 12:30:12 +0200 Subject: [PATCH] Build mysql_jdbc library even when building without java Change-Id: Iecf49ab466a77f8342e69bf245a30e1529fe0078 Reviewed-on: https://gerrit.libreoffice.org/79056 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar Reviewed-on: https://gerrit.libreoffice.org/81917 Tested-by: Jenkins --- connectivity/Module_connectivity.mk | 1 + postprocess/CustomTarget_registry.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 1a29e0798948..6a5dd926331b 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_flat \ Configuration_mysql_jdbc \ Configuration_odbc \ + Configuration_mysql_jdbc \ Configuration_writer \ Library_calc \ Library_dbase \ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index a2560f2e2d74..579c608cf7fb 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -277,8 +277,9 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) postprocess_FILES_main += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu -postprocess_DRIVERS += dbase flat odbc + $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu +postprocess_DRIVERS += dbase flat odbc mysql_jdbc ifeq (WNT,$(OS)) else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))