diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2019-09-17 12:30:12 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-09-19 13:32:10 +0200 |
| commit | 1fb358bcd50d6729dde8071c857206ce7560f1a0 (patch) | |
| tree | 3f3de7a4d839de52ae8037d0efc22c0e4fd83dcf /postprocess | |
| parent | dfe0b5ee5cdeeef65fb0bd35457d64d10540eede (diff) | |
Build mysql_jdbc library even when building without java
Change-Id: Iecf49ab466a77f8342e69bf245a30e1529fe0078
Reviewed-on: https://gerrit.libreoffice.org/79056
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 10 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 43a401db5092..f8460eae30ba 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))) @@ -331,9 +332,8 @@ endif ifeq ($(ENABLE_JAVA),TRUE) postprocess_FILES_main += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu -postprocess_DRIVERS += hsqldb jdbc mysql_jdbc + $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu +postprocess_DRIVERS += hsqldb jdbc endif ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) postprocess_FILES_main += \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 6e92e790339f..f53ed61c8eb1 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -263,8 +263,8 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_JAVA), \ connectivity/source/drivers/hsqldb/hsqldb \ connectivity/source/drivers/jdbc/jdbc \ - connectivity/source/drivers/mysql_jdbc/mysql_jdbc \ ) \ + connectivity/source/drivers/mysql_jdbc/mysql_jdbc \ connectivity/source/manager/sdbc2 \ connectivity/source/drivers/writer/writer \ dbaccess/source/ext/macromigration/dbmm \ |