diff options
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 4 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 10 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index d23d93aaa9f5..12a104dd0eab 100644 --- a/Repository.mk +++ b/Repository.mk @@ -404,7 +404,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ msfilter \ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ - $(if $(ENABLE_JAVA),mysql_jdbc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ numbertext \ odbc \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 4d2596c4602e..a604345a4735 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_calc \ Configuration_dbase \ Configuration_flat \ + Configuration_mysql_jdbc \ Configuration_odbc \ Configuration_writer \ Library_calc \ @@ -28,6 +29,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_file \ Library_flat \ $(if $(filter ANDROID iOS,$(OS)),,Library_odbc) \ + Library_mysql_jdbc \ Library_sdbc2 \ Library_writer \ )) @@ -40,8 +42,6 @@ ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_hsqldb \ Configuration_jdbc \ - Configuration_mysql_jdbc \ - Library_mysql_jdbc \ Jar_sdbc_hsqldb \ Library_hsqldb \ Library_jdbc \ 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 \ |