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

Eric Anholt eric at anholt.net
Fri Apr 28 21:43:39 UTC 2017


Peter Hutterer <peter.hutterer at who-t.net> writes:

> 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)
> +EXTRA_DIST += meson_options.txt \
> +              hw/xfree86/loader/symbol-test.c \
> +              hw/xfree86/common/xf86Build.sh \
> +              $(meson_files)

Matching sucks because it might pick up other things, but it's the only
reasonable solution when using autotool's make dist.  Hopefully we can
stop that soon.

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20170428/f5fdd259/attachment.sig>


More information about the xorg-devel mailing list