Kaydet (Commit) 43f30952 authored tarafından Tamas Bunth's avatar Tamas Bunth Kaydeden (comit) Tamás Bunth

mysqlc: fix registry configuration

Change-Id: Iefe1446e5f28471c6cafd256b29612c2457e42fc
Reviewed-on: https://gerrit.libreoffice.org/59640
Tested-by: Jenkins
Reviewed-by: 's avatarTamás Bunth <btomi96@gmail.com>
üst bce87186
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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,\ $(eval $(call gb_Configuration_add_spool_modules,driver_mysqlc,connectivity/registry/mysqlc,\
org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ 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 \ org/openoffice/Office/DataAccess/Drivers.xcu \
)) ))
# vim: set noet sw=4 ts=4:
...@@ -277,9 +277,8 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ...@@ -277,9 +277,8 @@ 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/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysql.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 mysqlc odbc postprocess_DRIVERS += dbase flat odbc
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)))
...@@ -341,6 +340,12 @@ postprocess_FILES_main += \ ...@@ -341,6 +340,12 @@ postprocess_FILES_main += \
postprocess_DRIVERS += firebird_sdbc postprocess_DRIVERS += firebird_sdbc
endif 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)) ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment