Merge pull request PowerDNS#15929 from miodvallat/cement

miodvallat · web-flow · commit 5f902b39297c · 2025-10-03T07:07:35.000+02:00
grow auth source tarballs fatter
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,3 +11,6 @@ libyahttp_la_SOURCES = \
 	utility.hpp \
 	yahttp-config.h \
 	yahttp.hpp
+
+EXTRA_DIST = \
+	meson.build
diff --git a/meson.build b/meson.build
@@ -1021,11 +1021,20 @@ if python.found()
   foreach tool, info: tools
     if 'manpages' in info
       foreach man_page: info['manpages']
-        generated_man_pages += man_page
+        if not fs.is_file('docs' / man_page)
+          generated_man_pages += man_page
+        else
+          install_man(
+            'docs' / man_page,
+            install_dir: join_paths(get_option('mandir'), 'man1'),
+          )
+        endif
       endforeach
     endif
   endforeach
-  custom_target(
+  if generated_man_pages.length() != 0
+    summary('Generating man pages', true, section: 'Manual Pages')
+    custom_target(
      'man-pages',
      input: man_pages,
      output: generated_man_pages,
@@ -1041,7 +1050,10 @@ if python.found()
        '--source-directory', docs_dir,
        '--target-directory', '@BUILD_ROOT@',
      ] + man_pages,
-  )
+    )
+  else
+    summary('Generating man pages', false, section: 'Manual Pages')
+  endif
 endif
 
 if get_option('unit-tests')
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -46,24 +46,25 @@ AM_CPPFLAGS +=$(LIBSODIUM_CFLAGS)
 endif
 
 EXTRA_DIST = \
-	dnslabeltext.rl \
+	api-swagger.json \
+	api-swagger.yaml \
+	bindparser.hh \
+	convert-yaml-to-json.py \
 	dnslabeltext.cc \
+	dnslabeltext.rl \
 	dnsmessage.proto \
+	generate-api-swagger.py \
+	incfiles \
 	inflighter.cc \
-	bindparser.hh \
-	named.conf.parsertest \
-	pdns.service.in \
-	ixfrdist.service.in \
 	ixfrdist.example.yml \
+	ixfrdist.service.in \
 	lua-record.cc \
 	minicurl.cc \
 	minicurl.hh \
-	standalone_fuzz_target_runner.cc \
-	api-swagger.yaml \
-	api-swagger.json \
+	named.conf.parsertest \
+	pdns.service.in \
 	requirements.txt \
-	incfiles \
-	convert-yaml-to-json.py
+	standalone_fuzz_target_runner.cc
 
 BUILT_SOURCES = \
 	bind-dnssec.schema.sqlite3.sql.h \
