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 --- src/common/Makefile.am | 3 ++- src/pacman/Makefile.am | 2 ++ src/util/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') 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/ -- cgit v1.2.3-24-g4f1b