[Mesa-dev] [PATCH 1/7] isl: automake: don't include isl_format_layout.c in two lists.

[Jason Ekstrand]

On Jun 1, 2016 4:20 PM, "Jason Ekstrand" <jason at jlekstrand.net> wrote:
>
>
> On May 31, 2016 9:27 AM, "Emil Velikov" <emil.l.velikov at gmail.com> wrote:
> >
> > From: Emil Velikov <emil.velikov at collabora.com>
> >
> > Including the file in both ISL_FILES and ISL_GENERATED_FILES makes
> > the actual dependency list less obvious.
> >
> > Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> > ---
> >  src/intel/isl/Makefile.am      | 2 +-
> >  src/intel/isl/Makefile.sources | 1 -
> >  src/intel/vulkan/Makefile.am   | 1 +
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
> > index 4922b1f..74f863a 100644
> > --- a/src/intel/isl/Makefile.am
> > +++ b/src/intel/isl/Makefile.am
> > @@ -50,7 +50,7 @@ libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init
> >
> >  libisl_la_LIBADD = $(ISL_GEN_LIBS)
> >
> > -libisl_la_SOURCES = $(ISL_FILES)
> > +libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES)
> >
> >  libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES)
> >  libisl_gen7_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=70
> > diff --git a/src/intel/isl/Makefile.sources
b/src/intel/isl/Makefile.sources
> > index fe6a00f..89b1418 100644
> > --- a/src/intel/isl/Makefile.sources
> > +++ b/src/intel/isl/Makefile.sources
> > @@ -2,7 +2,6 @@ ISL_FILES = \
> >         isl.c \
> >         isl.h \
> >         isl_format.c \
> > -       isl_format_layout.c \
> >         isl_gen4.c \
> >         isl_gen4.h \
> >         isl_gen6.c \
> > diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> > index 37c2986..9d36b22 100644
> > --- a/src/intel/vulkan/Makefile.am
> > +++ b/src/intel/vulkan/Makefile.am
> > @@ -129,6 +129,7 @@ VULKAN_ENTRYPOINT_CPPFLAGS = \
> >         -DVK_USE_PLATFORM_WAYLAND_KHR
> >
> >  anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
> > +       $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS)
$(top_srcdir)/include/vulkan/vulkan_intel.h >parsed_header.log 2>&1
>
> I don't think this line was intended.

With that fixed

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

> >         $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS)
$(top_srcdir)/include/vulkan/vulkan_intel.h |\
> >         $(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@
> >
> > --
> > 2.8.2
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160601/bbc48efa/attachment.html>