diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-26 14:50:02 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-08-28 20:39:07 +0200 |
commit | 552ed2dfdfa1a85ead25b2d654c03782412784d9 (patch) | |
tree | 7978d677126f0296cb96ae33a6a581a4dcfe8edf | |
parent | f392bc8993461ad748d6465051b48e3c219bcf3d (diff) |
don't need dangling Library_mysqlcppconn.mk
Reviewed-on: https://gerrit.libreoffice.org/59607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 74ef0185b1945d610c591b7ec3cda67e5c857d22)
Change-Id: I18fbe9feead3d48d9437cc7372eb1373ffb67c3e
-rw-r--r-- | external/mysql-connector-cpp/Library_mysqlcppconn.mk | 87 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 3 |
2 files changed, 0 insertions, 90 deletions
diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk deleted file mode 100644 index 152aee8c0764..000000000000 --- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk +++ /dev/null @@ -1,87 +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_Library_Library,mysqlcppconn)) - -$(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysql-connector-cpp)) - -$(eval $(call gb_Library_use_externals,mysqlcppconn, \ - boost_headers \ - mariadb-connector-c \ -)) - -ifneq ($(OS),WNT) - -$(eval $(call gb_Library_add_libs,mysqlcppconn,\ - $(if $(filter-out MACOSX,$(OS)),-ldl) \ -)) - -endif - -ifeq ($(OS),MACOSX) -ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),) -$(eval $(call gb_Library_use_externals,mysqlcppconn,\ - iconv \ -)) -endif -endif - -$(eval $(call gb_Library_set_external_code,mysqlcppconn)) - -$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn)) - -$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp)) - -$(eval $(call gb_Library_set_include,mysqlcppconn,\ - $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \ - -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \ -)) - -$(eval $(call gb_Library_add_defs,mysqlcppconn,\ - -Dmysqlcppconn_EXPORTS \ - $(if $(filter WNT,$(OS)),\ - -DCPPDBC_WIN32 \ - -D_CRT_SECURE_NO_WARNINGS \ - -D_SCL_SECURE_NO_WARNINGS ) \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_libs,mysqlcppconn,\ - -lpthread \ -)) -endif - -$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ - UnpackedTarball/mysql-connector-cpp/driver/mysql_art_resultset \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_art_rset_metadata \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_connection \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_debug \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_driver \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_metadata \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_parameter_metadata \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_prepared_statement \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset_metadata \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_resultbind \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset_metadata \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_statement \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_uri \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_util \ - UnpackedTarball/mysql-connector-cpp/driver/mysql_warning \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_client_api \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/library_loader \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_driver_wrapper \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_connection_wrapper \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_resultset_wrapper \ - UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index cd5cd51826d2..96c80f2da548 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4667,9 +4667,6 @@ external/libpng/configs/pnglibconf.h external/mariadb-connector-c/configs/linux_my_config.h external/mariadb-connector-c/configs/mac_my_config.h external/mariadb-connector-c/configs/mysql_version.h -external/mysql-connector-cpp/binding_config.h -external/mysql-connector-cpp/config.h -external/mysql-connector-cpp/version_info.h external/neon/configs/config.h external/redland/raptor/raptor2.h external/redland/raptor/raptor_config.h |