Merge remote-tracking branch 'origin/master'

[thirdparty/pdns.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8b2c27c43480a6ee246a38c7c9d7fdc66ab4736..e26c915213ad876fc7da89ea10655f337abf0a9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,15 @@
-SUBDIRS = ext modules codedocs docs
-
-SUBDIRS += pdns
+SUBDIRS = ext modules pdns codedocs docs
 
 EXTRA_DIST = \
        INSTALL \
        NOTICE \
        README \
-       .version \
-       build-aux/gen-version \
+       COPYING \
        codedocs/doxygen.conf \
        contrib/powerdns.solaris.init.d \
        pdns/named.conf.parsertest \
-       regression-tests/zones/unit.test
+       regression-tests/zones/unit.test \
+       builder-support/gen-version
 
 ACLOCAL_AMFLAGS = -I m4