Remove libbind9

It is now empty.

diff --git a/Makefile.top b/Makefile.top
index 62c5293c2c7555c54fd6c3ab100e7cb2a3510114..93047dc3136e4f315edeb7ba1875b226b90deb16 100644 (file)
--- a/Makefile.top
+++ b/Makefile.top
@@ -57,9 +57,3 @@ LIBISCCC_CFLAGS = \
 
 LIBISCCC_LIBS = \
        $(top_builddir)/lib/isccc/libisccc.la
-
-LIBBIND9_CFLAGS = \
-       -I$(top_srcdir)/lib/bind9/include
-
-LIBBIND9_LIBS = \
-       $(top_builddir)/lib/bind9/libbind9.la

diff --git a/bin/check/Makefile.am b/bin/check/Makefile.am
index 8f63c3506af9a118faaccd9171ee7e463d26f407..c25dc4d3bf1e5df640082d3c105e93a5f51aa508 100644 (file)
--- a/bin/check/Makefile.am
+++ b/bin/check/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS +=                  \
        $(LIBISC_CFLAGS)        \
        $(LIBDNS_CFLAGS)        \
        $(LIBNS_CFLAGS)         \
-       $(LIBISCCFG_CFLAGS)     \
-       $(LIBBIND9_CFLAGS)
+       $(LIBISCCFG_CFLAGS)
 
 AM_CPPFLAGS +=                 \
        -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
@@ -21,8 +20,7 @@ LDADD +=                      \
        $(LIBISC_LIBS)          \
        $(LIBDNS_LIBS)          \
        $(LIBNS_LIBS)           \
-       $(LIBISCCFG_LIBS)       \
-       $(LIBBIND9_LIBS)
+       $(LIBISCCFG_LIBS)
 
 bin_PROGRAMS = named-checkconf named-checkzone
 

diff --git a/bin/dig/Makefile.am b/bin/dig/Makefile.am
index b36f0f45251aa5d4c1ba727bd2bf740c5fb31160..a14e418e458b1a651f832808085d3b1f1c9b222f 100644 (file)
--- a/bin/dig/Makefile.am
+++ b/bin/dig/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS +=                  \
        $(LIBDNS_CFLAGS)        \
        $(LIBISCCFG_CFLAGS)     \
        $(LIBIRS_CFLAGS)        \
-       $(LIBBIND9_CFLAGS)      \
        $(LIBIDN2_CFLAGS)       \
        $(LIBUV_CFLAGS)
 
@@ -15,7 +14,6 @@ LDADD +=                      \
        $(LIBDNS_LIBS)          \
        $(LIBISCCFG_LIBS)       \
        $(LIBIRS_LIBS)          \
-       $(LIBBIND9_LIBS)        \
        $(LIBIDN2_LIBS)
 
 noinst_LTLIBRARIES = libdighost.la

diff --git a/bin/named/Makefile.am b/bin/named/Makefile.am
index 38045f00aa3c83f089e5aec085c6aab469fa4738..5c861b3ca6603086dd24f2bd91672f543134437d 100644 (file)
--- a/bin/named/Makefile.am
+++ b/bin/named/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS +=                          \
        $(LIBNS_CFLAGS)                 \
        $(LIBISCCC_CFLAGS)              \
        $(LIBISCCFG_CFLAGS)             \
-       $(LIBBIND9_CFLAGS)              \
        $(OPENSSL_CFLAGS)               \
        $(LIBCAP_CFLAGS)                \
        $(LMDB_CFLAGS)                  \
@@ -103,7 +102,6 @@ named_LDADD =                                       \
        $(LIBNS_LIBS)                           \
        $(LIBISCCC_LIBS)                        \
        $(LIBISCCFG_LIBS)                       \
-       $(LIBBIND9_LIBS)                        \
        $(OPENSSL_LIBS)                         \
        $(LIBCAP_LIBS)                          \
        $(LMDB_LIBS)                            \

diff --git a/bin/nsupdate/Makefile.am b/bin/nsupdate/Makefile.am
index 18c8645f8271d98cab096ab4ae6918ef9e530f63..f76efed6f67efb36f9ffdf9b295b98a62c426bc3 100644 (file)
--- a/bin/nsupdate/Makefile.am
+++ b/bin/nsupdate/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS +=                  \
        $(LIBDNS_CFLAGS)        \
        $(LIBISCCFG_CFLAGS)     \
        $(LIBIRS_CFLAGS)        \
-       $(LIBBIND9_CFLAGS)      \
        $(GSSAPI_CFLAGS)        \
        $(KRB5_CFLAGS)          \
        $(READLINE_CFLAGS)
@@ -18,7 +17,6 @@ LDADD +=                      \
        $(LIBDNS_LIBS)          \
        $(LIBISCCFG_LIBS)       \
        $(LIBIRS_LIBS)          \
-       $(LIBBIND9_LIBS)        \
        $(GSSAPI_LIBS)          \
        $(KRB5_LIBS)
 

diff --git a/bin/rndc/Makefile.am b/bin/rndc/Makefile.am
index a668522bc2a0291fe58bfb50cf66ff9f9eaea11a..f8f0ac96d539e50df97768497b8a0800da53b1fe 100644 (file)
--- a/bin/rndc/Makefile.am
+++ b/bin/rndc/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS +=                  \
        $(LIBISC_CFLAGS)        \
        $(LIBDNS_CFLAGS)        \
        $(LIBISCCFG_CFLAGS)     \
-       $(LIBISCCC_CFLAGS)      \
-       $(LIBBIND9_CFLAGS)
+       $(LIBISCCC_CFLAGS)
 
 AM_CPPFLAGS +=                                         \
        -DRNDC_CONFFILE=\"${sysconfdir}/rndc.conf\"     \
@@ -22,5 +21,4 @@ rndc_LDADD =                  \
        $(LIBISC_LIBS)          \
        $(LIBDNS_LIBS)          \
        $(LIBISCCC_LIBS)        \
-       $(LIBISCCFG_LIBS)       \
-       $(LIBBIND9_LIBS)
+       $(LIBISCCFG_LIBS)

diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am
index d7b8e4a3317fccb59053615ec27de02db6c1be5d..0df1c7409b559dd8dc0d68f1ae81f3d9685d1888 100644 (file)
--- a/bin/tools/Makefile.am
+++ b/bin/tools/Makefile.am
@@ -18,16 +18,6 @@ bin_PROGRAMS =                       \
 arpaname_LDADD =               \
        $(LIBISC_LIBS)
 
-mdig_CPPFLAGS =                        \
-       $(AM_CPPFLAGS)          \
-       $(LIBBIND9_CFLAGS)
-
-mdig_LDADD =                   \
-       $(LIBBIND9_LIBS)        \
-       $(LIBISCCFG_LIBS)       \
-       $(LIBDNS_LIBS)          \
-       $(LIBISC_LIBS)
-
 if HAVE_DNSTAP
 bin_PROGRAMS +=                        \
        dnstap-read

diff --git a/configure.ac b/configure.ac
index c180364dfb436c90b0b33574d8cfc142a4f97a30..2fb95415143c7908b8f037d541597408bb050ae0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1560,8 +1560,7 @@ AC_CONFIG_FILES([lib/Makefile
                 lib/ns/Makefile
                 lib/irs/Makefile
                 lib/isccfg/Makefile
-                lib/isccc/Makefile
-                lib/bind9/Makefile])
+                lib/isccc/Makefile])
 
 # Documentation
 

diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index 3ee7c3c9378e08270f03af59e87a81f40a60e5b5..3dbc90618b98377f4366712f09f86ea4d8b9cd50 100644 (file)
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -268,11 +268,8 @@ libraries.
     * `bind9/lib/dns`: implements higher-level DNS functionality:
       red-black trees, rdatasets, views, zones, ACLs, resolver, validator, etc
         * `bind9/lib/dns/tests`: unit tests for libdns
-    * `bind9/lib/bind9`: library implementing bind9-specific functionality,
-      principally configuration validity checking (used in `named` and
-      `named-checkconf` when reading `named.conf`).
     * `bind9/lib/isccfg`: library implementing the `named.conf`
-      configuration parser.
+      configuration parser and checker.
     * `bind9/lib/isccc`: library implementing the control channel used
       by `rndc`
     * `bind9/lib/irs`: provides mechanisms for reading `/etc/resolv.conf`

diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in
index 8fab9caa80f2e4770cde76af2a7766bd74bebc39..3dd23e78f802b054bfd1a68589142878ac53bcfd 100644 (file)
--- a/doc/doxygen/Doxyfile.in
+++ b/doc/doxygen/Doxyfile.in
@@ -475,7 +475,6 @@ INPUT                  = @BIND9_TOP_BUILDDIR@/lib/isc               \
                         @BIND9_TOP_BUILDDIR@/lib/isccfg        \
                         @BIND9_TOP_BUILDDIR@/lib/isccc         \
                         @BIND9_TOP_BUILDDIR@/lib/ns            \
-                        @BIND9_TOP_BUILDDIR@/lib/bind9         \
                         @BIND9_TOP_BUILDDIR@/bin/check         \
                         @BIND9_TOP_BUILDDIR@/bin/dig           \
                         @BIND9_TOP_BUILDDIR@/bin/dnssec        \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 39741a427fbd6ade4a0b3707ba820e2deb749855..3f3b451d1d6a828e5bfaa3229e881df684467461 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.top
 
-SUBDIRS = isc dns isccc ns isccfg bind9 irs
+SUBDIRS = isc dns isccc ns isccfg irs

diff --git a/lib/bind9/Makefile.am b/lib/bind9/Makefile.am
deleted file mode 100644 (file)
index dc8888f..0000000
--- a/lib/bind9/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-include $(top_srcdir)/Makefile.top
-
-lib_LTLIBRARIES = libbind9.la
-
-libbind9_ladir = $(includedir)/bind9
-
-libbind9_la_HEADERS =
-
-libbind9_la_SOURCES =          \
-       $(libbind9_la_HEADERS)
-
-libbind9_la_CPPFLAGS =         \
-       $(AM_CPPFLAGS)          \
-       $(LIBISC_CFLAGS)        \
-       $(LIBDNS_CFLAGS)        \
-       $(LIBISCCFG_CFLAGS)     \
-       $(LIBNS_CFLAGS)         \
-       $(LIBBIND9_CFLAGS)      \
-       $(OPENSSL_CFLAGS)
-
-libbind9_la_LIBADD =           \
-       $(LIBNS_LIBS)           \
-       $(LIBISCCFG_LIBS)       \
-       $(LIBDNS_LIBS)          \
-       $(LIBISC_LIBS)
-
-libbind9_la_LDFLAGS =          \
-       $(AM_LDFLAGS)           \
-       -release "$(PACKAGE_VERSION)"
-
-if HAVE_DNSTAP
-libbind9_la_CPPFLAGS += $(DNSTAP_CFLAGS)
-endif

diff --git a/lib/bind9/include/.clang-format b/lib/bind9/include/.clang-format
deleted file mode 120000 (symlink)
index 0e62f72..0000000
--- a/lib/bind9/include/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../../.clang-format.headers
\ No newline at end of file