autotools: distribute meson files

If we use make dist to create the official, signed release tarballs,
those will not have meson build files by default since autotools doesn't
know what they are.

Also distribute all src/common/ files. We never strictly needed any of
them to be distributed with autotools, because the dist tarball
dereferences the symlinks (???), but only some of them were being
distributed, and meson needs them to be in the right location as we only
build libcommon from the primary files.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>

Makefile.am

@@ -14,7 +14,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \
 
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README
-EXTRA_DIST = HACKING test/tap.sh
+EXTRA_DIST = \
+	HACKING test/tap.sh \
+	meson.build meson_options.txt \
+	build-aux/edit-script.sh.in \
+	build-aux/meson-install-script.sh \
+	build-aux/meson-make-symlink.sh \
+	build-aux/script-wrapper.sh.in
+
 
 # Sample makepkg prototype files
 pkgdatadir = ${datadir}/${PACKAGE}

doc/Makefile.am

@@ -33,6 +33,7 @@ HTML_DOCS = \
 	$(HTML_OTHER)
 
 EXTRA_DIST = \
+	meson.build \
 	asciidoc.conf \
 	asciidoc-override.css \
 	alpm-hooks.5.asciidoc \

lib/libalpm/Makefile.am

@@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS = po
 
+EXTRA_DIST = meson.build po/meson.build
+
 lib_LTLIBRARIES = libalpm.la
 include_HEADERS = alpm_list.h alpm.h
 

scripts/Makefile.am

@@ -22,6 +22,7 @@ OURSCRIPTS = \
 	repo-add
 
 EXTRA_DIST = \
+	meson.build \
 	libmakepkg.pc.in \
 	makepkg.sh.in \
 	makepkg-template.pl.in \
@@ -135,6 +136,7 @@ LIBMAKEPKG_IN = \
 	libmakepkg/util/util.sh
 
 LIBMAKEPKG_DIST = \
+	$(addprefix libmakepkg/, $(addsuffix /meson.build, $(LIBMAKEPKGDIRS))) \
 	$(addsuffix .in, $(LIBMAKEPKG_IN))
 
 WRAPPER = \

src/common/Makefile.am

@@ -1,2 +1,3 @@
 EXTRA_DIST = \
-	util-common.h util-common.c
+	meson.build \
+	ini.h ini.c util-common.h util-common.c

src/pacman/Makefile.am

@@ -1,5 +1,7 @@
 SUBDIRS = po
 
+EXTRA_DIST = meson.build po/meson.build
+
 # paths set at make time
 conffile  = ${sysconfdir}/pacman.conf
 dbpath    = ${localstatedir}/lib/pacman/

src/util/Makefile.am

@@ -1,3 +1,5 @@
+EXTRA_DIST = meson.build
+
 # paths set at make time
 conffile  = ${sysconfdir}/pacman.conf
 dbpath    = ${localstatedir}/lib/pacman/

test/pacman/Makefile.am

@@ -14,6 +14,7 @@ check_SCRIPTS = \
 noinst_SCRIPTS = $(check_SCRIPTS)
 
 EXTRA_DIST = \
+	meson.build \
 	README \
 	TODO \
 	ChangeLog \

test/scripts/Makefile.am

@@ -7,4 +7,5 @@ check_SCRIPTS = \
 noinst_SCRIPTS = $(check_SCRIPTS)
 
 EXTRA_DIST = \
+	meson.build \
 	$(check_SCRIPTS)

test/util/Makefile.am

@@ -4,4 +4,5 @@ check_SCRIPTS = \
 noinst_SCRIPTS = $(check_SCRIPTS)
 
 EXTRA_DIST = \
+	meson.build \
 	$(check_SCRIPTS)