From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 12 Sep 2018 14:47:35 +0000 (+0200)
Subject: [#28,!20] Removed libkea-cb, only left header files.
X-Git-Tag: 134-bugs--xcode-10_base~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6e36a40c482424f162acc266ab53029ddfeb8b;p=thirdparty%2Fkea.git

[#28,!20] Removed libkea-cb, only left header files.
---

diff --git a/src/lib/config_backend/Makefile.am b/src/lib/config_backend/Makefile.am
index fdb2b986dd..163d378799 100644
--- a/src/lib/config_backend/Makefile.am
+++ b/src/lib/config_backend/Makefile.am
@@ -5,25 +5,12 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
-lib_LTLIBRARIES = libkea-cb.la
-libkea_cb_la_SOURCES  = base_config_backend.h
-libkea_cb_la_SOURCES += base_config_backend_mgr.h
-libkea_cb_la_SOURCES += base_config_backend_pool.cc base_config_backend_pool.h
-
-
-libkea_cb_la_LIBADD  = $(top_builddir)/src/lib/database/libkea-database.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_cb_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_cb_la_LIBADD += $(BOOST_LIBS)
-
-libkea_cb_la_LDFLAGS = -no-undefined -version-info 0:0:0
+EXTRA_DIST  = base_config_backend.h
+EXTRA_DIST += base_config_backend_mgr.h
+EXTRA_DIST += base_config_backend_pool.h
 
 # The message file should be in the distribution.
-#EXTRA_DIST = config_backend.dox
+#EXTRA_DIST += config_backend.dox
 
 CLEANFILES = *.gcno *.gcda
 
diff --git a/src/lib/config_backend/base_config_backend_pool.cc b/src/lib/config_backend/base_config_backend_pool.cc
deleted file mode 100644
index 46420e73d8..0000000000
--- a/src/lib/config_backend/base_config_backend_pool.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
-//
-// 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/.
-
-#include <config_backend/base_config_backend_pool.h>
-
-namespace isc {
-namespace cb {
-
-
-
-} // end of namespace isc::cb
-} // end of namespace isc
diff --git a/src/lib/config_backend/tests/Makefile.am b/src/lib/config_backend/tests/Makefile.am
index 23574e4e09..0ab44250c3 100644
--- a/src/lib/config_backend/tests/Makefile.am
+++ b/src/lib/config_backend/tests/Makefile.am
@@ -25,8 +25,7 @@ libcb_unittests_SOURCES += run_unittests.cc
 libcb_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 libcb_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-libcb_unittests_LDADD  = $(top_builddir)/src/lib/config_backend/libkea-cb.la
-libcb_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+libcb_unittests_LDADD  = $(top_builddir)/src/lib/database/libkea-database.la
 libcb_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 libcb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libcb_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 6f88a6418d..23f83d48fd 100644
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -213,7 +213,6 @@ if HAVE_CQL
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cql/libkea-cql.la
 endif
 
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/config_backend/libkea-cb.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/database/libkea-database.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la