mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build mysql_jdbc library even when building without java

Browse Source 
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>
Reviewed-on: https://gerrit.libreoffice.org/81917
Tested-by: Jenkins
This commit is contained in:
Tamas Bunth
2019-09-17 12:30:12 +02:00
committed by Andras Timar
parent aa394fd920
commit f9fb1e1abc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
connectivity/Module_connectivity.mk
View File

@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_flat \ Configuration_flat \
Configuration_mysql_jdbc \ Configuration_mysql_jdbc \
Configuration_odbc \ Configuration_odbc \
Configuration_mysql_jdbc \
Configuration_writer \ Configuration_writer \
Library_calc \ Library_calc \
Library_dbase \ Library_dbase \

5
postprocess/CustomTarget_registry.mk
View File

@@ -277,8 +277,9 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_main += \ 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/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/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
$(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.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/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu
postprocess_DRIVERS += dbase flat odbc mysql_jdbc
ifeq (WNT,$(OS)) ifeq (WNT,$(OS))
else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))