diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-11-23 17:49:54 +0100 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-11-24 23:15:34 +0100 |
| commit | da16857fe39ab94f5584ef62b1cd59686f98a5ef (patch) | |
| tree | 5cdece4c51708d6af22c78353c0023ca2e89a051 /postprocess | |
| parent | 796cbe6efcf0e7dcd9985bad0a8539a8952932f2 (diff) | |
Build mysql_jdbc library even when building..
.. without java
Change-Id: Id44ef2d94992423a12b32234822e8ed3f5a48299
Reviewed-on: https://gerrit.libreoffice.org/63889
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.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 d1583f2f81f5..e84c35eec7e5 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -331,9 +331,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 += \ @@ -428,8 +427,9 @@ postprocess_FILES_writer := \ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) postprocess_FILES_writer += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu -postprocess_DRIVERS += writer + $(call gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu +postprocess_DRIVERS += writer mysql_jdbc endif postprocess_DEPS_xsltfilter := main diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 7834751c660c..e189b433e4b0 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -261,8 +261,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 \ |