From bcb44891ef8aa6feee3090cc0fd87b60e73aed5d Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 15 Aug 2019 19:55:45 -0400 Subject: 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 Signed-off-by: Allan McRae --- Makefile.am | 9 ++++++++- doc/Makefile.am | 1 + lib/libalpm/Makefile.am | 2 ++ scripts/Makefile.am | 2 ++ src/common/Makefile.am | 3 ++- src/pacman/Makefile.am | 2 ++ src/util/Makefile.am | 2 ++ test/pacman/Makefile.am | 1 + test/scripts/Makefile.am | 1 + test/util/Makefile.am | 1 + 10 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 98ad8b62..c661f447 100644 --- a/Makefile.am +++ b/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} diff --git a/doc/Makefile.am b/doc/Makefile.am index 5c575832..a8dbbe05 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -33,6 +33,7 @@ HTML_DOCS = \ $(HTML_OTHER) EXTRA_DIST = \ + meson.build \ asciidoc.conf \ asciidoc-override.css \ alpm-hooks.5.asciidoc \ diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 1e01feeb..e4f83223 100644 --- a/lib/libalpm/Makefile.am +++ b/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 diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 0597a0e5..ea72f21e 100644 --- a/scripts/Makefile.am +++ b/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 = \ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index c0e37273..05378712 100644 --- a/src/common/Makefile.am +++ b/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 diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 2344daff..ac2f8e46 100644 --- a/src/pacman/Makefile.am +++ b/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/ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 8c6a5771..a454f224 100644 --- a/src/util/Makefile.am +++ b/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/ diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index a36908a7..d211215a 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -14,6 +14,7 @@ check_SCRIPTS = \ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ + meson.build \ README \ TODO \ ChangeLog \ diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index 450a278d..07fe63da 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -7,4 +7,5 @@ check_SCRIPTS = \ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ + meson.build \ $(check_SCRIPTS) diff --git a/test/util/Makefile.am b/test/util/Makefile.am index 92824e8c..a270079f 100644 --- a/test/util/Makefile.am +++ b/test/util/Makefile.am @@ -4,4 +4,5 @@ check_SCRIPTS = \ noinst_SCRIPTS = $(check_SCRIPTS) EXTRA_DIST = \ + meson.build \ $(check_SCRIPTS) -- cgit v1.2.3-24-g4f1b