[Mesa-dev] [PATCH] anv: Prefer in-tree headers to out-of-tree headers

[Ville Syrjälä]

On Tue, Nov 29, 2016 at 08:28:55AM -0800, Jason Ekstrand wrote:
> On Tue, Nov 29, 2016 at 1:23 AM, <ville.syrjala at linux.intel.com> wrote:
> 
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> > Set the include paths to consider in-tree headers before out-of-tree
> > headers.
> >
> > Avoids the build failing due to stale headers being present in
> > $prefix. Previosuly 'make -ki install' or something similar was required
> > to update the out-of-tree headers to allow the build to succeed.
> >
> > Also avoids having to rebuild the entire thing after every 'make
> > install'.
> >
> > Cc: Rob Clark <robdclark at gmail.com>
> > Cc: Jason Ekstrand <jason.ekstrand at intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  src/intel/vulkan/Makefile.am | 16 +++++++++++-----
> >  1 file changed, 11 insertions(+), 5 deletions(-)
> >
> > diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> > index ce31abb2fce7..b80f8767296c 100644
> > --- a/src/intel/vulkan/Makefile.am
> > +++ b/src/intel/vulkan/Makefile.am
> > @@ -43,9 +43,6 @@ noinst_LTLIBRARIES = $(PER_GEN_LIBS)
> >  # The gallium includes are for the util/u_math.h include from
> > main/macros.h
> >
> >  AM_CPPFLAGS = \
> > -       $(INTEL_CFLAGS) \
> > -       $(VALGRIND_CFLAGS) \
> > -       $(DEFINES) \
> >         -I$(top_srcdir)/include \
> >         -I$(top_builddir)/src \
> >         -I$(top_srcdir)/src \
> > @@ -61,6 +58,17 @@ AM_CPPFLAGS = \
> >         -I$(top_builddir)/src/intel \
> >         -I$(top_srcdir)/src/intel
> >
> > +if HAVE_PLATFORM_WAYLAND
> > +AM_CPPFLAGS += \
> > +       -I$(top_builddir)/src/egl/wayland/wayland-drm \
> > +       -I$(top_srcdir)/src/egl/wayland/wayland-drm
> > +endif
> >
> 
> I think I have a mild preference for keeping wayland stuff together and
> moving the last AM_CPPFLAGS down but I don't care that much.  Either way,

Would we still want all internal -I knobs to appear before any
external ones? To do that I'd have flip the x11 vs. wayland stuff
around. And if someone were to add internal -I knobs for x11 then
this scheme wouldn't work either way.

Not sure if sticking to a strict global ordering like that is needed,
but at least it would seem a bit easier to maintain as you wouldn't
have to think too hard when adding new flags.

> 
> Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
> 
> 
> > +
> > +AM_CPPFLAGS += \
> > +       $(INTEL_CFLAGS) \
> > +       $(VALGRIND_CFLAGS) \
> > +       $(DEFINES)
> > +
> >  AM_CFLAGS = \
> >         $(VISIBILITY_CFLAGS) \
> >         -Wno-override-init -msse2
> > @@ -99,8 +107,6 @@ endif
> >
> >  if HAVE_PLATFORM_WAYLAND
> >  AM_CPPFLAGS += \
> > -       -I$(top_builddir)/src/egl/wayland/wayland-drm \
> > -       -I$(top_srcdir)/src/egl/wayland/wayland-drm \
> >         $(WAYLAND_CFLAGS) \
> >         -DVK_USE_PLATFORM_WAYLAND_KHR
> >
> > --
> > 2.7.4
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >

-- 
Ville Syrjälä
Intel OTC