From d99f8cf85b730379783fc09fe1689412acfbce78 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Fri, 25 Jul 2025 15:52:29 +0200 Subject: [PATCH] Be sure to add the meson build files to the contents of `make dist'. Signed-off-by: Miod Vallat --- Makefile.am | 4 ++++ docs/Makefile.am | 4 +++- ext/Makefile.am | 3 +++ ext/arc4random/Makefile.am | 3 +++ ext/ipcrypt/Makefile.am | 3 ++- ext/json11/Makefile.am | 4 ++++ ext/lmdb-safe/Makefile.am | 3 --- ext/yahttp/Makefile.am | 5 ++++- ext/yahttp/yahttp/Makefile.am | 3 +++ modules/Makefile.am | 3 +++ modules/bindbackend/Makefile.am | 5 ++++- modules/geoipbackend/Makefile.am | 5 ++++- modules/gmysqlbackend/Makefile.am | 3 ++- modules/godbcbackend/Makefile.am | 3 ++- modules/gpgsqlbackend/Makefile.am | 3 ++- modules/gsqlite3backend/Makefile.am | 3 ++- modules/ldapbackend/Makefile.am | 1 + modules/lmdbbackend/Makefile.am | 5 ++++- modules/lua2backend/Makefile.am | 5 ++++- modules/pipebackend/Makefile.am | 5 ++++- modules/remotebackend/Makefile.am | 1 + modules/tinydnsbackend/Makefile.am | 5 ++++- pdns/Makefile.am | 1 + 23 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index db54310797..c1c88fb1ef 100644 --- 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 27445bd503..1f2ae072b8 100644 --- 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 0ae01c430f..e7e7e5996c 100644 --- 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 73479d160a..72ce72eaf7 100644 --- 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 cd66bfcd17..d7f3c8ac6b 100644 --- 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 df5f856652..cfd3e5ce62 100644 --- 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 452f220d8d..4a309c326d 100644 --- 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 aaaeee0875..f1ac6624f0 100644 --- 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 3ed41e5fd2..3b7149e4cf 100644 --- 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 1c51fb6438..dc1b8af2e3 100644 --- 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 a41769b0bd..d623b6bb45 100644 --- 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 0c32f2922a..efea26c518 100644 --- 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 431160f6f4..ca2f309c6a 100644 --- 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 ed4f765e50..c35c1be46f 100644 --- 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 0d190862fb..6fc0c953f3 100644 --- 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 8f3a1dfffa..a77f066202 100644 --- 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 685b05743c..f6bffea7b6 100644 --- 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 0211a80650..91c0fbde1d 100644 --- 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 22cdcb0593..fbd2ffe984 100644 --- 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 3b25f497a7..cc3a338994 100644 --- 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 a342a87cf6..fa0a5b02a7 100644 --- 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 7b9dbfc30d..f5976bad42 100644 --- 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 edc18de969..9722a3fd12 100644 --- 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 \ -- 2.47.3