[Mesa-dev] [PATCH] intel/tools: add error2aub creation into autotools

[Dylan Baker]

Quoting Lionel Landwerlin (2018-08-02 09:46:59)
> On 02/08/18 17:39, Andres Gomez wrote:
> > Tarball distribution is done through "make distcheck". We include the
> > meson targets also into autotools so they won't fail when building
> > from the tarball.
> >
> > Fixes: 6a60beba408 ("intel/tools: Add an error state to aub translator")
> > Cc: Jason Ekstrand <jason.ekstrand at intel.com>
> > Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> > Cc: Dylan Baker <dylan.c.baker at intel.com>
> > Signed-off-by: Andres Gomez <agomez at igalia.com>
> 
> Looks like I'll have to update some stuff on my branches.
> I was hoping that we could start forgetting about autotools but forgot 
> about about released tarballs :(
> 
> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

We could just shove all of the sources into EXTRA_DIST and call it good.

> 
> > ---
> > This just fixes running the default "meson _build" from the inflated
> > tarball. Not sure we need to include more targets.
> >
> >   src/intel/Makefile.tools.am | 24 +++++++++++++++++++++++-
> >   1 file changed, 23 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
> > index b00cc8cc2cb..00624084e6f 100644
> > --- a/src/intel/Makefile.tools.am
> > +++ b/src/intel/Makefile.tools.am
> > @@ -21,7 +21,9 @@
> >   
> >   noinst_PROGRAMS += \
> >       tools/aubinator \
> > -     tools/aubinator_error_decode
> > +     tools/aubinator_error_decode \
> > +     tools/error2aub
> > +
> >   
> >   tools_aubinator_SOURCES = \
> >       tools/aubinator.c \
> > @@ -59,3 +61,23 @@ tools_aubinator_error_decode_LDADD = \
> >   tools_aubinator_error_decode_CFLAGS = \
> >       $(AM_CFLAGS) \
> >       $(ZLIB_CFLAGS)
> > +
> > +
> > +tools_error2aub_SOURCES = \
> > +     tools/gen_context.h \
> > +     tools/gen8_context.h \
> > +     tools/gen10_context.h \
> > +     tools/aub_write.h \
> > +     tools/aub_write.c \
> > +     tools/error2aub.c
> > +
> > +tools_error2aub_CFLAGS = \
> > +     $(AM_CFLAGS) \
> > +     $(ZLIB_CFLAGS)
> > +
> > +tools_error2aub_LDADD = \
> > +     dev/libintel_dev.la \
> > +     $(PTHREAD_LIBS) \
> > +     $(DLOPEN_LIBS) \
> > +     $(ZLIB_LIBS) \
> > +     -lm
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180802/b2b9147f/attachment-0001.sig>