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

Mark Kettenis mark.kettenis at xs4all.nl
Fri Apr 28 12:01:27 UTC 2017


> Date: Fri, 28 Apr 2017 16:09:55 +1000
> From: Peter Hutterer <peter.hutterer at who-t.net>
> 
> While we're providing 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>
> ---
> triggered by:
> https://mail.gnome.org/archives/desktop-devel-list/2017-April/msg00091.html
> 
> I opted to keep all the meson-specifics in one location rather than
> sprinkling it across the various Makefile.am's.
> 
>  Makefile.am | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index f0fa2d8..2c51f5e 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -74,6 +74,12 @@ endif
>  
>  EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh
>  
> +meson_files = $(shell find . -type f -name '*meson.*' -print 2>/dev/null)

Unfortunately $(shell ...) is a GNU make extension.

Also, this will pick up random crap that happens to match the pattern,
such as editor backup files etc. etc.

> +EXTRA_DIST += meson_options.txt \
> +              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
> 
> 


More information about the xorg-devel mailing list