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

Eric Engestrom eric.engestrom at imgtec.com
Fri Apr 28 10:47:32 UTC 2017


On Friday, 2017-04-28 11:30:08 +0100, Eric Engestrom wrote:
> On Friday, 2017-04-28 16:09:55 +1000, Peter Hutterer wrote:
> > 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)
> 
> What is '*meson.*' matching, other than 'meson.build'?

I could've simply ran it instead of asking... :)

The only other file is include/xorg-config.h.meson.in, which I'd argue
could be matched using something like this instead?
	find . -type f \( -name meson.build -o -name '*.meson.in' \) -print

> 
> > +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
> > 


More information about the xorg-devel mailing list