Fix "make dist"

Make various adjustments necessary to enable "make dist" to build a BIND
source tarball whose contents are complete enough to build binaries, run
unit & system tests, and generate documentation on Unix systems.

Known outstanding issues:

  - "make distcheck" does not work yet.
  - Tests do not work for out-of-tree source-tarball-based builds.
  - Source tarballs are not complete enough for building on Windows.

All of the above will be addressed in due course.

diff --git a/Makefile.am b/Makefile.am
index 6ea8e8d4caafe0541db0d33d362fe14cd18a8c54..13e499f8972658bb04ed80f27cdf1c3aa6083560 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,3 +11,14 @@ bind.keys.h: bind.keys Makefile
 dist_sysconf_DATA = bind.keys
 
 .PHONY: doc
+
+EXTRA_DIST =                   \
+       util/bindkeys.pl        \
+       contrib                 \
+       CHANGES                 \
+       COPYRIGHT               \
+       LICENSE                 \
+       *.md
+
+dist-hook:
+       find $(distdir) -type f -name .gitignore -delete

diff --git a/bin/named/Makefile.am b/bin/named/Makefile.am
index 718cfd405ddba0b6b5d890027660c6007f76d82b..3717fb9fc93183748b507ea5566b30fbf5b51a10 100644 (file)
--- a/bin/named/Makefile.am
+++ b/bin/named/Makefile.am
@@ -37,6 +37,8 @@ nodist_named_SOURCES = xsl.c
 BUILT_SOURCES = xsl.c
 CLEANFILES = xsl.c
 
+EXTRA_DIST = bind9.xsl
+
 xsl.c: bind9.xsl Makefile
        (echo 'const char xslmsg[] =' &&        \
         $(SED) -e 's,\",\\\",g'                \
@@ -61,6 +63,7 @@ named_SOURCES =                               \
        zoneconf.c                      \
        unix/dlz_dlopen_driver.c        \
        unix/os.c                       \
+       include/dlz/dlz_dlopen_driver.h \
        include/named/builtin.h         \
        include/named/config.h          \
        include/named/control.h         \

diff --git a/bin/tests/Makefile.am b/bin/tests/Makefile.am
index fc017eb1f284984fb650916772a7fd7daea87564..2947df96c9653003a24bbe6b40692d279711d398 100644 (file)
--- a/bin/tests/Makefile.am
+++ b/bin/tests/Makefile.am
@@ -11,3 +11,5 @@ AM_CPPFLAGS +=                        \
 LDADD =                                \
        $(LIBISC_LIBS)          \
        $(LIBDNS_LIBS)
+
+EXTRA_DIST = prepare-softhsm2.sh

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 003d8698a8b9cb8815cecd4b6acf59bd45b7db7e..9c812ad8cfb97f36c747d6e46465a9f5d6bc3005 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -1,5 +1,14 @@
 include $(top_srcdir)/Makefile.top
 
+EXTRA_DIST = .
+
+# Source tarballs must not contain configure/build artifacts.
+dist-hook:
+       git clean -n -x -d | \
+               grep -v "Makefile.in$$" | \
+               sed -n "s|^Would remove \(.*\)|$(distdir)/\1|p" | \
+               xargs -I{} rm -rf "{}"
+
 SUBDIRS = dyndb/driver dlzexternal/driver
 
 AM_CPPFLAGS +=                 \

diff --git a/bin/tests/system/dlzexternal/driver/Makefile.am b/bin/tests/system/dlzexternal/driver/Makefile.am
index 418ec59de0bf119091d9e19fe12088b163798ec3..8d9bc0131eba29d8aa1ee127a4dc6d5cf297ee26 100644 (file)
--- a/bin/tests/system/dlzexternal/driver/Makefile.am
+++ b/bin/tests/system/dlzexternal/driver/Makefile.am
@@ -8,6 +8,7 @@ dlzexternal_LTLIBRARIES = dlzexternal.la
 dlzexternaldir = $(abs_builddir)
 
 dlzexternal_la_SOURCES =       \
-       driver.c
+       driver.c                \
+       driver.h
 
 dlzexternal_la_LDFLAGS = -avoid-version -module -shared -export-dynamic

diff --git a/bin/tests/system/dyndb/driver/Makefile.am b/bin/tests/system/dyndb/driver/Makefile.am
index c8751239d886ad93007e5fbe8748ee9ba59a2d83..c90510c80eec189c76df6e3810e9600e9398efaf 100644 (file)
--- a/bin/tests/system/dyndb/driver/Makefile.am
+++ b/bin/tests/system/dyndb/driver/Makefile.am
@@ -14,6 +14,13 @@ sample_la_SOURCES =  \
        lock.c          \
        log.c           \
        syncptr.c       \
-       zone.c
+       zone.c          \
+       db.h            \
+       instance.h      \
+       lock.h          \
+       log.h           \
+       syncptr.h       \
+       util.h          \
+       zone.h
 
 sample_la_LDFLAGS = -avoid-version -module -shared -export-dynamic

diff --git a/configure.ac b/configure.ac
index a1787adf666f558ab66118059c4b582901781b40..8fb9cac1c9de2ae96db42488fa1300578c1985a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFIGARGS"], [Either 'defaults
 AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
 
 AC_CONFIG_SRCDIR([bin/named/main.c])
-AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall -Werror])
+AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz -Wall -Werror])
 AM_SILENT_RULES([yes])
 AM_EXTRA_RECURSIVE_TARGETS([test unit doc])
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c9722094ddf7f3fb355addb52c11d406783182d1..2811d5a65b616360c0604263517786e89a68da36 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,5 +7,3 @@ endif
 if HAVE_SPHINX_BUILD
 SUBDIRS += man arm
 endif HAVE_SPHINX_BUILD
-
-EXTRA_DIST = notes/

diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am
index f20239ea6612062c01e2963d3dd08f53ead43f9b..ce17e48bc85b09302eae33f898292fd3e006d3e9 100644 (file)
--- a/doc/arm/Makefile.am
+++ b/doc/arm/Makefile.am
@@ -1,49 +1,49 @@
 include $(top_srcdir)/Makefile.top
 include $(top_srcdir)/Makefile.docs
 
-EXTRA_DIST =                           \
-       conf.py                         \
-       acl.grammar.rst                 \
-       advanced.rst                    \
-       catz.rst                        \
-       configuration.rst               \
-       controls.grammar.rst            \
-       delegation-only.zoneopt.rst     \
-       dlz.rst                         \
-       dnssec-keys.grammar.rst         \
-       dnssec.rst                      \
-       dyndb.rst                       \
-       forward.zoneopt.rst             \
-       general.rst                     \
-       hint.zoneopt.rst                \
-       history.rst                     \
-       in-view.zoneopt.rst             \
-       index.rst                       \
-       introduction.rst                \
-       key.grammar.rst                 \
-       logging-categories.rst          \
-       logging.grammar.rst             \
-       managed-keys.grammar.rst        \
-       managed-keys.rst                \
-       manpages.rst                    \
-       master.zoneopt.rst              \
-       masters.grammar.rst             \
-       mirror.zoneopt.rst              \
-       notes.rst                       \
-       options.grammar.rst             \
-       pkcs11.rst                      \
-       plugins.rst                     \
-       redirect.zoneopt.rst            \
-       reference.rst                   \
-       requirements.rst                \
-       security.rst                    \
-       server.grammar.rst              \
-       slave.zoneopt.rst               \
-       static-stub.zoneopt.rst         \
-       statistics-channels.grammar.rst \
-       stub.zoneopt.rst                \
-       troubleshooting.rst             \
-       trusted-keys.grammar.rst
+EXTRA_DIST =                                   \
+       conf.py                                 \
+       advanced.rst                            \
+       catz.rst                                \
+       configuration.rst                       \
+       dlz.rst                                 \
+       dnssec.rst                              \
+       dyndb.rst                               \
+       general.rst                             \
+       history.rst                             \
+       index.rst                               \
+       introduction.rst                        \
+       logging-categories.rst                  \
+       managed-keys.rst                        \
+       manpages.rst                            \
+       notes.rst                               \
+       pkcs11.rst                              \
+       plugins.rst                             \
+       reference.rst                           \
+       requirements.rst                        \
+       security.rst                            \
+       troubleshooting.rst                     \
+       ../misc/acl.grammar.rst                 \
+       ../misc/controls.grammar.rst            \
+       ../misc/delegation-only.zoneopt.rst     \
+       ../misc/forward.zoneopt.rst             \
+       ../misc/hint.zoneopt.rst                \
+       ../misc/in-view.zoneopt.rst             \
+       ../misc/key.grammar.rst                 \
+       ../misc/logging.grammar.rst             \
+       ../misc/managed-keys.grammar.rst        \
+       ../misc/master.zoneopt.rst              \
+       ../misc/masters.grammar.rst             \
+       ../misc/mirror.zoneopt.rst              \
+       ../misc/options.grammar.rst             \
+       ../misc/redirect.zoneopt.rst            \
+       ../misc/server.grammar.rst              \
+       ../misc/slave.zoneopt.rst               \
+       ../misc/static-stub.zoneopt.rst         \
+       ../misc/statistics-channels.grammar.rst \
+       ../misc/stub.zoneopt.rst                \
+       ../misc/trusted-keys.grammar.rst        \
+       ../notes/*.rst
 
 html-local:
        $(AM_V_SPHINX)$(SPHINX_BUILD) -b html -d $(SPHINXBUILDDIR)/doctrees $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/html
@@ -66,7 +66,7 @@ epub:
 
 install-epub:
        $(INSTALL) -d $(DESTDIR)/$(docdir)
-       $(INSTALL_DATA) $(SPHINXBUILDDIR)/epub/KnotDNS.epub $(DESTDIR)/$(docdir)/
+       $(INSTALL_DATA) $(SPHINXBUILDDIR)/epub/*.epub $(DESTDIR)/$(docdir)/
 
 if HAVE_XELATEX
 pdf-local:

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 5e661068a725e04dfedc9f14f7b6f1449a446943..3821376f803bf754f94fcf1093af5313d76f1487 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -18,6 +18,7 @@ MANPAGES_RST =                                \
        dnstap-read.rst                 \
        filter-aaaa.rst                 \
        host.rst                        \
+       index.rst                       \
        mdig.rst                        \
        named-checkconf.rst             \
        named-checkzone.rst             \
@@ -35,7 +36,41 @@ MANPAGES_RST =                               \
        pkcs11-tokens.rst               \
        rndc-confgen.rst                \
        rndc.conf.rst                   \
-       rndc.rst
+       rndc.rst                        \
+       ../../bin/check/named-checkconf.rst \
+       ../../bin/check/named-checkzone.rst \
+       ../../bin/confgen/ddns-confgen.rst \
+       ../../bin/confgen/rndc-confgen.rst \
+       ../../bin/delv/delv.rst \
+       ../../bin/dig/dig.rst \
+       ../../bin/dig/host.rst \
+       ../../bin/dig/nslookup.rst \
+       ../../bin/dnssec/dnssec-cds.rst \
+       ../../bin/dnssec/dnssec-dsfromkey.rst \
+       ../../bin/dnssec/dnssec-importkey.rst \
+       ../../bin/dnssec/dnssec-keyfromlabel.rst \
+       ../../bin/dnssec/dnssec-keygen.rst \
+       ../../bin/dnssec/dnssec-revoke.rst \
+       ../../bin/dnssec/dnssec-settime.rst \
+       ../../bin/dnssec/dnssec-signzone.rst \
+       ../../bin/dnssec/dnssec-verify.rst \
+       ../../bin/named/named.rst \
+       ../../bin/nsupdate/nsupdate.rst \
+       ../../bin/pkcs11/pkcs11-destroy.rst \
+       ../../bin/pkcs11/pkcs11-keygen.rst \
+       ../../bin/pkcs11/pkcs11-list.rst \
+       ../../bin/pkcs11/pkcs11-tokens.rst \
+       ../../bin/plugins/filter-aaaa.rst \
+       ../../bin/rndc/rndc.conf.rst \
+       ../../bin/rndc/rndc.rst \
+       ../../bin/tools/arpaname.rst \
+       ../../bin/tools/dnstap-read.rst \
+       ../../bin/tools/mdig.rst \
+       ../../bin/tools/named-journalprint.rst \
+       ../../bin/tools/named-nzd2nzf.rst \
+       ../../bin/tools/named-rrchecker.rst \
+       ../../bin/tools/nsec3hash.rst
+
 
 man_MANS =                             \
        arpaname.1                      \

diff --git a/doc/misc/Makefile.am b/doc/misc/Makefile.am
index 3eaace0b59d449894eaa29c358f46d191923d30f..26a3980b58608d420ed949b89a2e8135a88fc717 100644 (file)
--- a/doc/misc/Makefile.am
+++ b/doc/misc/Makefile.am
@@ -51,7 +51,14 @@ BUILT_SOURCES =                              \
        managed-keys.grammar.rst        \
        trusted-keys.grammar.rst
 
-EXTRA_DIST = $(BUILT_SOURCES)
+EXTRA_DIST =                   \
+       $(BUILT_SOURCES)        \
+       format-options.pl       \
+       rst-grammars.pl         \
+       rst-options.pl          \
+       rst-zoneopt.pl          \
+       sort-options.pl
+
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 options: cfg_test

diff --git a/lib/bind9/Makefile.am b/lib/bind9/Makefile.am
index ffba4ace11617473a57b8d4020668d94f78ab367..3501cef49cd70826c1eaa60173f7199141c1c818 100644 (file)
--- a/lib/bind9/Makefile.am
+++ b/lib/bind9/Makefile.am
@@ -28,3 +28,5 @@ libbind9_la_LIBADD =          \
 
 libbind9_la_LDFLAGS =          \
        $(libbind9_VERSION_INFO)
+
+EXTRA_DIST = api

diff --git a/lib/dns/Makefile.am b/lib/dns/Makefile.am
index 5f6abc14db6ea773d0d6fcaf6fbeaefb4cc00262..78a2752c90219954b78b96b29d2fd84175aa84e8 100644 (file)
--- a/lib/dns/Makefile.am
+++ b/lib/dns/Makefile.am
@@ -25,7 +25,11 @@ gen_SOURCES = gen.c gen-unix.h
 gen_CPPFLAGS =                 \
        $(AM_CPPFLAGS)
 
-EXTRA_DIST = gen-win32.h
+EXTRA_DIST =           \
+       api             \
+       dnstap.proto    \
+       gen-win32.h     \
+       rdata/*
 
 include/dns/enumtype.h: gen Makefile
        mkdir -p include/dns

diff --git a/lib/dns/tests/Makefile.am b/lib/dns/tests/Makefile.am
index 9f3ee80cce22131a88b101f6a2909400c544f8c5..04ef09c0f53e20e42162797c0e8f9ecf1956f0a1 100644 (file)
--- a/lib/dns/tests/Makefile.am
+++ b/lib/dns/tests/Makefile.am
@@ -109,4 +109,11 @@ rsa_test_CPPFLAGS =                \
 
 unit-local: check
 
+EXTRA_DIST =                   \
+       Kdh.+002+18602.key      \
+       Krsa.+005+29235.key     \
+       mkraw.pl                \
+       testdata                \
+       testkeys
+
 LOG_COMPILER = $(builddir)/../../unit-test-driver.sh

diff --git a/lib/irs/Makefile.am b/lib/irs/Makefile.am
index 6330e4e9863cda4bfe0e80e7ca922df4269a8818..75d514cbcb80d7b803c9f540962a60d0bae4bd16 100644 (file)
--- a/lib/irs/Makefile.am
+++ b/lib/irs/Makefile.am
@@ -29,3 +29,5 @@ libirs_la_LDFLAGS =           \
 if HAVE_CMOCKA
 SUBDIRS = tests
 endif
+
+EXTRA_DIST = api

diff --git a/lib/irs/tests/Makefile.am b/lib/irs/tests/Makefile.am
index 6b9bb583eb979dcbe4b843703c8539dd7b3d4dbc..d256663853595d31860d40f5a8254e5bad05e75f 100644 (file)
--- a/lib/irs/tests/Makefile.am
+++ b/lib/irs/tests/Makefile.am
@@ -16,4 +16,6 @@ TESTS = $(check_PROGRAMS)
 
 unit-local: check
 
+EXTRA_DIST = testdata
+
 LOG_COMPILER = $(builddir)/../../unit-test-driver.sh

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 870083201181aaf54e7156351ac1ccfc5de5cb5b..19bf5b677ec1d25334312193ef79ec3c45f5de03 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -94,6 +94,7 @@ libisc_la_HEADERS =                   \
        pthreads/include/isc/mutex.h    \
        pthreads/include/isc/once.h     \
        pthreads/include/isc/thread.h   \
+       unix/errno2result.h             \
        unix/include/isc/align.h        \
        unix/include/isc/dir.h          \
        unix/include/isc/netdb.h        \
@@ -252,3 +253,5 @@ endif HAVE_LIBXML2
 if HAVE_CMOCKA
 SUBDIRS = tests
 endif
+
+EXTRA_DIST = api

diff --git a/lib/isc/tests/Makefile.am b/lib/isc/tests/Makefile.am
index 3723a392de4d5c9ec8557aeb2580e2fe93270187..443a925bdbee484ba6f73f7747e6c4f6212e9066 100644 (file)
--- a/lib/isc/tests/Makefile.am
+++ b/lib/isc/tests/Makefile.am
@@ -9,7 +9,10 @@ LDADD +=                       \
        $(LIBISC_LIBS)
 
 check_LTLIBRARIES = libisctest.la
-libisctest_la_SOURCES = isctest.c isctest.h
+libisctest_la_SOURCES =        \
+       ../unix/socket_p.h      \
+       isctest.c               \
+       isctest.h
 
 check_PROGRAMS =       \
        aes_test        \
@@ -34,6 +37,7 @@ check_PROGRAMS =      \
        regex_test      \
        result_test     \
        safe_test       \
+       siphash_test    \
        sockaddr_test   \
        socket_test     \
        symtab_test     \
@@ -66,4 +70,6 @@ random_test_LDADD =   \
 
 unit-local: check
 
+EXTRA_DIST = testdata
+
 LOG_COMPILER = $(builddir)/../../unit-test-driver.sh

diff --git a/lib/isccc/Makefile.am b/lib/isccc/Makefile.am
index 017f822a32e969aa5661e85c025ab90da6f161fb..477cc525fba04dff09614f753a730a40f2836f44 100644 (file)
--- a/lib/isccc/Makefile.am
+++ b/lib/isccc/Makefile.am
@@ -40,3 +40,5 @@ libisccc_la_LDFLAGS =         \
 if HAVE_CMOCKA
 SUBDIRS = tests
 endif
+
+EXTRA_DIST = api

diff --git a/lib/isccfg/Makefile.am b/lib/isccfg/Makefile.am
index bd337f67aece0f7320305ea36d7f7ffd8a75e3e0..ef0cd16fc8c9534969b612102dd7e46e4f128907 100644 (file)
--- a/lib/isccfg/Makefile.am
+++ b/lib/isccfg/Makefile.am
@@ -37,3 +37,5 @@ libisccfg_la_LDFLAGS =                \
 if HAVE_CMOCKA
 SUBDIRS = tests
 endif
+
+EXTRA_DIST = api

diff --git a/lib/isccfg/tests/Makefile.am b/lib/isccfg/tests/Makefile.am
index ce4ea0fd42f8d0dd261214ddc33d140c52ed7b45..19b82a45b3ba97979c8fbd08877630353dafbbfa 100644 (file)
--- a/lib/isccfg/tests/Makefile.am
+++ b/lib/isccfg/tests/Makefile.am
@@ -11,7 +11,8 @@ LDADD +=                      \
        $(LIBDNS_LIBS)          \
        $(LIBISCCFG_LIBS)
 
-check_PROGRAMS = \
+check_PROGRAMS =       \
+       duration_test   \
        parser_test
 
 TESTS = $(check_PROGRAMS)

diff --git a/lib/ns/Makefile.am b/lib/ns/Makefile.am
index 06e39b9af48f470f44de4eec4d12311a0b86ee26..b2f81ccf086638e85cababc87829a907a4c94796 100644 (file)
--- a/lib/ns/Makefile.am
+++ b/lib/ns/Makefile.am
@@ -56,3 +56,5 @@ libns_la_LDFLAGS =            \
 if HAVE_CMOCKA
 SUBDIRS = tests
 endif
+
+EXTRA_DIST = api

diff --git a/lib/ns/tests/Makefile.am b/lib/ns/tests/Makefile.am
index 415a21ee9633dcba851007b2f036512eed17fe72..092360cebd7e2f7a7a959969a7d7f53d4c6d835a 100644 (file)
--- a/lib/ns/tests/Makefile.am
+++ b/lib/ns/tests/Makefile.am
@@ -46,4 +46,6 @@ endif
 
 unit-local: check
 
+EXTRA_DIST = testdata
+
 LOG_COMPILER = $(builddir)/../../unit-test-driver.sh