[PATCH v2 xserver] Makefile.am: add the meson files to the tarball

Eric Engestrom eric at engestrom.ch
Mon May 1 10:44:40 UTC 2017


Reviewed-by: Eric Engestrom <eric at engestrom.ch>

On 1 May 2017 10:29:16 BST, Peter Hutterer <peter.hutterer at who-t.net> wrote:
>While we're shipping both build systems, we'll likely have 'make dist'
>generated tarballs - those tarballs should be buildable with meson to
>have more exposure.
>
>Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>---
>Changes to v1:
>- include the config.h.meson.in manually, reduce match to 'meson.build'
>only
>
> Makefile.am | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/Makefile.am b/Makefile.am
>index f0fa2d8..c28969e 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -74,6 +74,13 @@ endif
> 
> EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
> 
>+meson_files = $(shell find . -type f -name 'meson.build' -print
>2>/dev/null)
>+EXTRA_DIST += meson_options.txt \
>+              include/xorg-config.h.meson.in \
>+              hw/xfree86/loader/symbol-test.c \
>+              hw/xfree86/common/xf86Build.sh \
>+              $(meson_files)
>+
> DISTCHECK_CONFIGURE_FLAGS=\
> 	--with-xkb-path=$(XKB_BASE_DIRECTORY) \
> 	--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
>-- 
>2.9.3
>
>_______________________________________________
>xorg-devel at lists.x.org: X.Org development
>Archives: http://lists.x.org/archives/xorg-devel
>Info: https://lists.x.org/mailman/listinfo/xorg-devel

Cheers,
  Eric


More information about the xorg-devel mailing list