diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-08-27 10:21:32 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-08-27 12:59:58 +0200 |
| commit | 43f30952f39e4d568befff2a224418435a8c7691 (patch) | |
| tree | 4251bbf2e0dd144cbb6d4e913180824cef9c6bfb | |
| parent | bce87186e5a67d5e5cf9dc169a67e852ef5f9bec (diff) | |
mysqlc: fix registry configuration
Change-Id: Iefe1446e5f28471c6cafd256b29612c2457e42fc
Reviewed-on: https://gerrit.libreoffice.org/59640
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
| -rw-r--r-- | connectivity/Configuration_mysql.mk | 9 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/connectivity/Configuration_mysql.mk b/connectivity/Configuration_mysql.mk index 3e3f0b908ecb..5ef54c70a80c 100644 --- a/connectivity/Configuration_mysql.mk +++ b/connectivity/Configuration_mysql.mk @@ -7,13 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Configuration_Configuration,mysqlc)) +$(eval $(call gb_Configuration_Configuration,driver_mysqlc)) -$(eval $(call gb_Configuration_add_spool_modules,mysqlc,connectivity/registry/mysqlc,\ - org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ +$(eval $(call gb_Configuration_add_spool_modules,driver_mysqlc,connectivity/registry/mysqlc,\ + org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu \ )) -$(eval $(call gb_Configuration_add_localized_datas,mysqlc,connectivity/registry/mysqlc,\ +$(eval $(call gb_Configuration_add_localized_datas,driver_mysqlc,connectivity/registry/mysqlc,\ org/openoffice/Office/DataAccess/Drivers.xcu \ )) +# vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 601297714188..4968b6e3eaf5 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -277,9 +277,8 @@ 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/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu -postprocess_DRIVERS += dbase flat mysqlc odbc +postprocess_DRIVERS += dbase flat odbc ifeq (WNT,$(OS)) else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) @@ -341,6 +340,12 @@ postprocess_FILES_main += \ postprocess_DRIVERS += firebird_sdbc endif +ifeq ($(ENABLE_MARIADBC),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu +postprocess_DRIVERS += mysqlc +endif + ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA)) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu else |