Be sure to add the meson build files to the contents of `make dist'.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/Makefile.am b/Makefile.am
index db54310797fdf2a8c161ab69b44f25d935836538..c1c88fb1ef5e31d74f1f84fc1712a0b2554345eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,12 @@ EXTRA_DIST = \
        NOTICE \
        README \
        COPYING \
+       auth/systemd \
        codedocs/doxygen.conf \
        contrib/powerdns.solaris.init.d \
+       meson \
+       meson.build \
+       meson_options.txt \
        pdns/named.conf.parsertest \
        regression-tests/zones/unit.test \
        regression-tests/zones/unit2.test \

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 27445bd503f8b7e13c32b88e380c1879cca43b18..1f2ae072b8deb88e69b1bdfa2b3368dcd069f93e 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -49,7 +49,9 @@ endif
 
 man_MANS = $(MANPAGES_INSTALL)
 
-EXTRA_DIST = $(MANPAGES_DIST)
+EXTRA_DIST = \
+       $(MANPAGES_DIST) \
+       http-api/swagger/authoritative-api-swagger.yaml
 
 if HAVE_VENV
 if !HAVE_MANPAGES

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 0ae01c430f3edf07348e85e21dc24b9518cdc11f..e7e7e5996c8ce4a40990f94f95997e3ecbf4b1dd 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -11,6 +11,9 @@ DIST_SUBDIRS = \
        yahttp
 
 EXTRA_DIST = \
+       lmdb-safe/LICENSE \
+       lmdb-safe/meson.build \
        luawrapper/include/LuaContext.hpp \
+       luawrapper/meson.build \
        protozero/* protozero/include/protozero/*
 

diff --git a/ext/arc4random/Makefile.am b/ext/arc4random/Makefile.am
index 73479d160afcad131a6b2d50c9323e16f3e1a092..72ce72eaf78cf3002b7d783a907215c81962dc6e 100644 (file)
--- a/ext/arc4random/Makefile.am
+++ b/ext/arc4random/Makefile.am
@@ -9,3 +9,6 @@ libarc4random_la_SOURCES = \
        explicit_bzero.c \
        includes.h \
        log.h
+
+EXTRA_DIST = \
+       meson.build

diff --git a/ext/ipcrypt/Makefile.am b/ext/ipcrypt/Makefile.am
index cd66bfcd1786f7d380d72eb2353d561fdbe76794..d7f3c8ac6b5d7ca1aff30d1af7d9eb079d197694 100644 (file)
--- a/ext/ipcrypt/Makefile.am
+++ b/ext/ipcrypt/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
-       LICENSE
+       LICENSE \
+       meson.build
 
 noinst_LTLIBRARIES = libipcrypt.la
 

diff --git a/ext/json11/Makefile.am b/ext/json11/Makefile.am
index df5f8566521d449239f277f37e4d1a74df4b8671..cfd3e5ce62e7cc52f3b85be0242d2227dd407985 100644 (file)
--- a/ext/json11/Makefile.am
+++ b/ext/json11/Makefile.am
@@ -1,2 +1,6 @@
 noinst_LTLIBRARIES = libjson11.la
 libjson11_la_SOURCES = json11.cpp json11.hpp
+
+EXTRA_DIST = \
+       LICENSE.txt \
+       meson.build

diff --git a/ext/lmdb-safe/Makefile.am b/ext/lmdb-safe/Makefile.am
index 452f220d8d94c197a82efcf7f026734bed49bc5f..4a309c326d51a458a2a934ec134645e0834f5769 100644 (file)
--- a/ext/lmdb-safe/Makefile.am
+++ b/ext/lmdb-safe/Makefile.am
@@ -1,6 +1,3 @@
-EXTRA_DIST = \
-        LICENSE
-
 noinst_LTLIBRARIES = liblmdb-safe.la
 
 liblmdb-safe_la_SOURCES = \

diff --git a/ext/yahttp/Makefile.am b/ext/yahttp/Makefile.am
index aaaeee087506af801c9975978c88e3747d7a6f5e..f1ac6624f05abd0a992ba0f2a7edc90e34000138 100644 (file)
--- a/ext/yahttp/Makefile.am
+++ b/ext/yahttp/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = yahttp
 
-EXTRA_DIST = LICENSE README.md
+EXTRA_DIST = \
+       LICENSE \
+       README.md \
+       meson.build

diff --git a/ext/yahttp/yahttp/Makefile.am b/ext/yahttp/yahttp/Makefile.am
index 3ed41e5fd2cdd390bf0bc4717eb23e9095f15d12..3b7149e4cffd15afbf1dfae2917c4309a33c4f9f 100644 (file)
--- a/ext/yahttp/yahttp/Makefile.am
+++ b/ext/yahttp/yahttp/Makefile.am
@@ -11,3 +11,6 @@ libyahttp_la_SOURCES = \
        utility.hpp \
        yahttp-config.h \
        yahttp.hpp
+
+EXTRA_DIST = \
+       meson.build

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 1c51fb643885498a4d5761894fab31adc4e4ce26..dc1b8af2e30ed1a1adb8cde3b670c3fc9f42edac 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -13,3 +13,6 @@ DIST_SUBDIRS = \
        pipebackend \
        remotebackend \
        tinydnsbackend
+
+EXTRA_DIST = \
+       meson.build

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index a41769b0bdac982b881238a23d4c35f5c602a333..d623b6bb45ae5d02ae0964d5616f58bb626f7892 100644 (file)
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -12,7 +12,10 @@ dist_doc_DATA = \
        ../../pdns/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql \
        ../../pdns/bind-dnssec.schema.sqlite3.sql
 
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       meson.build
 
 libbindbackend_la_SOURCES = \
        bindbackend2.cc bindbackend2.hh \

diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am
index 0c32f2922abc1a15b1aacb6ebc11c02a21208eff..efea26c5182401a837692328d18b8faf3586cd96 100644 (file)
--- a/modules/geoipbackend/Makefile.am
+++ b/modules/geoipbackend/Makefile.am
@@ -1,6 +1,9 @@
 AM_CPPFLAGS += $(YAML_CFLAGS) $(GEOIP_CFLAGS) $(MMDB_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       meson.build
 
 pkglib_LTLIBRARIES = libgeoipbackend.la
 

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 431160f6f4f02129b6cf688475c8c7d0dbff9bdf..ca2f309c6a3d0ac83d5ea0609a972c920cdbc96a 100644 (file)
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -4,7 +4,8 @@ pkglib_LTLIBRARIES = libgmysqlbackend.la
 
 EXTRA_DIST = \
        OBJECTFILES \
-       OBJECTLIBS
+       OBJECTLIBS \
+       meson.build
 
 dist_doc_DATA = \
        dnssec-3.x_to_3.4.0_schema.mysql.sql \

diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am
index ed4f765e50ce347317df05b9f6d668e2eb1e4348..c35c1be46f424ed8538ed8d3b51f3927b417a9ff 100644 (file)
--- a/modules/godbcbackend/Makefile.am
+++ b/modules/godbcbackend/Makefile.am
@@ -3,7 +3,8 @@ pkglib_LTLIBRARIES = libgodbcbackend.la
 
 EXTRA_DIST = \
        OBJECTFILES \
-       OBJECTLIBS
+       OBJECTLIBS \
+       meson.build
 
 dist_doc_DATA = \
        schema.mssql.sql \

diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index 0d190862fb45accef708e904ae6831e622d4fd1f..6fc0c953f38748241d16d4db88bdf98875f40e0c 100644 (file)
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -4,7 +4,8 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la
 
 EXTRA_DIST = \
        OBJECTFILES \
-       OBJECTLIBS
+       OBJECTLIBS \
+       meson.build
 
 dist_doc_DATA = \
        schema.pgsql.sql \

diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index 8f3a1dfffa6a630faff3f480d96242a6919c6905..a77f06620299f0289bb9d8ae9a81dd7f272f34d9 100644 (file)
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS += $(LIBCRYPTO_INCLUDES)
 
 EXTRA_DIST = \
        OBJECTFILES \
-       OBJECTLIBS
+       OBJECTLIBS \
+       meson.build
 
 dist_doc_DATA = \
        dnssec-3.x_to_3.4.0_schema.sqlite3.sql \

diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
index 685b05743cf5ccf5f7d6ebaa0af74a0d6cd7d0b3..f6bffea7b68a56893263eaa36ae7dbe34dad5c6b 100644 (file)
--- a/modules/ldapbackend/Makefile.am
+++ b/modules/ldapbackend/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = \
     OBJECTFILES \
     OBJECTLIBS \
     dnsdomain2.schema \
+    meson.build \
     pdns-domaininfo.schema
 
 dist_doc_DATA = \

diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index 0211a80650f503de7e0cc26e9f01a49b7e6be51a..91c0fbde1df161d158a3d2d9903e4b63a37c5d19 100644 (file)
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -2,7 +2,10 @@ AM_CPPFLAGS += $(LMDB_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
 pkglib_LTLIBRARIES = liblmdbbackend.la
 
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       meson.build
 
 liblmdbbackend_la_SOURCES = \
        ../../ext/lmdb-safe/lmdb-safe.hh ../../ext/lmdb-safe/lmdb-safe.cc \

diff --git a/modules/lua2backend/Makefile.am b/modules/lua2backend/Makefile.am
index 22cdcb05939587162cbc03b453a9348d623e5b77..fbd2ffe984146896c733918e4cf0860abff4d65a 100644 (file)
--- a/modules/lua2backend/Makefile.am
+++ b/modules/lua2backend/Makefile.am
@@ -2,7 +2,10 @@ AM_CPPFLAGS += $(LUA_CFLAGS) \
        -I$(top_srcdir)/ext/luawrapper/include \
        $(LIBCRYPTO_INCLUDES)
 
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       meson.build
 
 pkglib_LTLIBRARIES = liblua2backend.la
 

diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am
index 3b25f497a769d1022add14e23d31bc9d155e8db6..cc3a33899411cb80bcdf854178e2d3db516bced7 100644 (file)
--- a/modules/pipebackend/Makefile.am
+++ b/modules/pipebackend/Makefile.am
@@ -5,7 +5,10 @@ AM_CPPFLAGS += $(LIBCRYPTO_INCLUDES)
 EXTRA_DIST = \
        OBJECTFILES \
        OBJECTLIBS \
-       backend.pl
+       backend.pl \
+       backend-v3.pl \
+       backend-v5.pl \
+       meson.build
 
 libpipebackend_la_SOURCES = \
        coprocess.cc coprocess.hh \

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index a342a87cf63c0c3acb6a33a76fb642d53acd9bf0..fa0a5b02a73b818c15c97df64237af1f5403926a 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -21,6 +21,7 @@ ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la
 EXTRA_DIST = \
        OBJECTFILES \
        OBJECTLIBS \
+       meson.build \
        testrunner.sh \
        unittest_http.py \
        unittest_json.py \

diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index 7b9dbfc30d3b3e0e268053705bb94ef1bd158358..f5976bad426e0148f6e4cf39602acb3bb883e5e5 100644 (file)
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -2,7 +2,10 @@ AM_CPPFLAGS += $(CDB_CFLAGS) $(LIBCRYPTO_INCLUDES)
 
 pkglib_LTLIBRARIES = libtinydnsbackend.la
 
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+EXTRA_DIST = \
+       OBJECTFILES \
+       OBJECTLIBS \
+       meson.build
 
 libtinydnsbackend_la_SOURCES = \
        ../../pdns/cdb.cc ../../pdns/cdb.hh \

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index edc18de969222a656062b8a6240ad8b2f109293d..9722a3fd127926fcbb61e45dfde7d53d452c9d12 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -53,6 +53,7 @@ EXTRA_DIST = \
        dnslabeltext.cc \
        dnslabeltext.rl \
        dnsmessage.proto \
+       generate-api-swagger.py \
        incfiles \
        inflighter.cc \
        ixfrdist.example.yml \