libmariadb: remove ExternalPackage_libmariadb

Change-Id: I15bf4537a88f2ae290d778ada993f06ec99c2fa5

4 files changed, 4 insertions, 59 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a7b0f08b23d..813cf4d94258 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -57,13 +57,16 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_mariadb
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(MARIADB_CFLAGS) \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	mariadblib \
 )
 
 endef
 define gb_ExternalProject__use_mariadb
-$(call gb_ExternalProject_use_package,$(1),libmariadb_inc)
 $(call gb_ExternalProject_use_static_libraries,$(1),mariadblib)
 
 endef
diff --git a/libmariadb/ExternalPackage_libmariadb.mk b/libmariadb/ExternalPackage_libmariadb.mk
deleted file mode 100644
index 3ed95d1deb0e..000000000000
--- a/libmariadb/ExternalPackage_libmariadb.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmariadb_inc,mariadb))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb,\
-    include/config-win.h \
-    include/dbug.h \
-    include/errmsg.h \
-    include/getopt.h \
-    include/global.h \
-    include/hash.h \
-    include/m_ctype.h \
-    include/m_string.h \
-    include/my_alarm.h \
-    include/my_base.h \
-    include/my_dir.h \
-    include/my_global.h \
-    include/my_list.h \
-    include/my_net.h \
-    include/my_no_pthread.h \
-    include/my_pthread.h \
-    include/my_secure.h \
-    include/mysql_com.h \
-    include/mysql_version.h \
-    include/mysqld_error.h \
-    include/mysql.h \
-    include/mysql_io.h \
-    include/mysql_mm.h \
-    include/mysql_priv.h \
-    include/mysql_wireprotocol.h \
-    include/my_stmt.h \
-    include/mysys_err.h \
-    include/my_sys.h \
-    include/sha1.h \
-    include/thr_alarm.h \
-    include/violite.h \
-))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libmariadb_inc,inc/external/libmariadb/mysql,\
-    include/mysql/client_plugin.h \
-    include/mysql/plugin_auth_common.h \
-    include/mysql/plugin_auth.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libmariadb/Module_libmariadb.mk b/libmariadb/Module_libmariadb.mk
index 667d55d88212..09c726ddb178 100644
--- a/libmariadb/Module_libmariadb.mk
+++ b/libmariadb/Module_libmariadb.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libmariadb))
 ifeq ($(SYSTEM_MARIADB),NO)
 
 $(eval $(call gb_Module_add_targets,libmariadb,\
-	ExternalPackage_libmariadb \
 	StaticLibrary_mariadb \
 	UnpackedTarball_mariadb \
 ))
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk
index 8555ab281c35..adebc5b027bc 100644
--- a/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/mysqlcppconn/Library_mysqlcppconn.mk
@@ -43,11 +43,6 @@ $(eval $(call gb_Library_add_defs,mysqlcppconn,\
 	-D_SCL_SECURE_NO_WARNINGS ) \
 ))
 
-$(eval $(call gb_Library_set_include,mysqlcppconn,\
-	$$(INCLUDE) \
-	$(MARIADB_CFLAGS) \
-))
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 	-lpthread \