build: Distribute Meson build system in release tarballs

As long as we are treating Autotools as a first-class citizen, what we
release will be `make distcheck` output.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 6078e33ca2da231b2090e126c67af77321e55716..37415bab5a6abdc65b3e33eeed226aadcaef46bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,10 @@ EXTRA_DIST =                 \
        bus/CMakeLists.txt \
        dbus/CMakeLists.txt \
        doc/CMakeLists.txt \
+       meson.build \
+       meson_options.txt \
+       meson_post_install.py \
+       meson_post_install_systemd.py \
        test/CMakeLists.txt \
        test/name-test/CMakeLists.txt \
        tools/CMakeLists.txt \

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 1595432c3beff65e67e5f16c1c48b4c542d31bc5..51a8de819517537f7c873d3272cbbcbf8762fca8 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -220,10 +220,15 @@ endif DBUS_UNIX
 EXTRA_DIST += \
        dbus.service.in \
        dbus.socket.in \
+       legacy-config/meson.build \
+       meson.build \
        systemd-user/dbus.service.in \
        systemd-user/dbus.socket.in \
+       systemd-user/meson.build \
        sysusers.d/dbus.conf.in \
+       sysusers.d/meson.build \
        tmpfiles.d/dbus.conf.in \
+       tmpfiles.d/meson.build \
        $(NULL)
 
 if HAVE_SYSTEMD

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index fbd817586370fe5014434433aaa267f8829f69c4..7e3e82e0634eafcb66eb2f5493808803652cb490 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -329,6 +329,8 @@ endif
 
 noinst_PROGRAMS =
 
+EXTRA_DIST += meson.build
+
 # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
 include $(top_srcdir)/aminclude_static.am
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 471ac2b546b225cc71a1dcef0fa13578a96be10c..5fe9b190922af90788345a7a8bf054fae30bda6d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -223,3 +223,7 @@ clean-local:
        rm -rf dbus-docs dbus-docs.tmp
        rm -f *.1.html
        rm -f doxygen.stamp
+
+EXTRA_DIST += maintainer-upload-docs.sh
+EXTRA_DIST += meson.build
+EXTRA_DIST += meson_post_install.py

diff --git a/test/Makefile.am b/test/Makefile.am
index e89d8ad4d4d64178e33bdeb6eb0aad2625c560f9..9886f285c52f068dcd50fb10b86aac228088045e 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -850,5 +850,11 @@ $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile
                echo 'Exec=env DBUS_TEST_EXEC=$(testexecdir) DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$* --tap'; \
        ) > $@.tmp && mv $@.tmp $@
 
+EXTRA_DIST += data/copy_data_for_tests.py
+EXTRA_DIST += data/installable/meson.build
+EXTRA_DIST += data/meson.build
+EXTRA_DIST += meson.build
+EXTRA_DIST += meta_template.test.in
+
 # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
 include $(top_srcdir)/aminclude_static.am

diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 527dbbff89d498f77e2d2a47a26ae3d2ac31ccb4..e1cc82d212aa663672dbbf6ffdb822b594a347c1 100644 (file)
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -121,3 +121,5 @@ test_autolaunch_LDADD = \
        $(NULL)
 endif
 endif
+
+EXTRA_DIST += meson.build

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e88ecffaa984cfe1fb1ed724dd4c4a1145a847d8..2a5f7df37dbd6ceca7a4ee445e95b57e4eed28de 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -151,3 +151,6 @@ install-data-local:
 
 installcheck-local:
        test -d $(DESTDIR)$(localstatedir)/lib/dbus
+
+EXTRA_DIST += build-timestamp.py
+EXTRA_DIST += meson.build