<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Nov 29, 2016 at 1:23 AM, <span dir="ltr"><<a href="mailto:ville.syrjala@linux.intel.com" target="_blank">ville.syrjala@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a><wbr>><br>
<br>
Set the include paths to consider in-tree headers before out-of-tree<br>
headers.<br>
<br>
Avoids the build failing due to stale headers being present in<br>
$prefix. Previosuly 'make -ki install' or something similar was required<br>
to update the out-of-tree headers to allow the build to succeed.<br>
<br>
Also avoids having to rebuild the entire thing after every 'make<br>
install'.<br>
<br>
Cc: Rob Clark <<a href="mailto:robdclark@gmail.com">robdclark@gmail.com</a>><br>
Cc: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br>
Signed-off-by: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a><wbr>><br>
---<br>
src/intel/vulkan/Makefile.am | 16 +++++++++++-----<br>
1 file changed, 11 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am<br>
index ce31abb2fce7..b80f8767296c 100644<br>
--- a/src/intel/vulkan/Makefile.am<br>
+++ b/src/intel/vulkan/Makefile.am<br>
@@ -43,9 +43,6 @@ noinst_LTLIBRARIES = $(PER_GEN_LIBS)<br>
# The gallium includes are for the util/u_math.h include from main/macros.h<br>
<br>
AM_CPPFLAGS = \<br>
- $(INTEL_CFLAGS) \<br>
- $(VALGRIND_CFLAGS) \<br>
- $(DEFINES) \<br>
-I$(top_srcdir)/include \<br>
-I$(top_builddir)/src \<br>
-I$(top_srcdir)/src \<br>
@@ -61,6 +58,17 @@ AM_CPPFLAGS = \<br>
-I$(top_builddir)/src/intel \<br>
-I$(top_srcdir)/src/intel<br>
<br>
+if HAVE_PLATFORM_WAYLAND<br>
+AM_CPPFLAGS += \<br>
+ -I$(top_builddir)/src/egl/<wbr>wayland/wayland-drm \<br>
+ -I$(top_srcdir)/src/egl/<wbr>wayland/wayland-drm<br>
+endif<br></blockquote><div><br></div><div>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,<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+AM_CPPFLAGS += \<br>
+ $(INTEL_CFLAGS) \<br>
+ $(VALGRIND_CFLAGS) \<br>
+ $(DEFINES)<br>
+<br>
AM_CFLAGS = \<br>
$(VISIBILITY_CFLAGS) \<br>
-Wno-override-init -msse2<br>
@@ -99,8 +107,6 @@ endif<br>
<br>
if HAVE_PLATFORM_WAYLAND<br>
AM_CPPFLAGS += \<br>
- -I$(top_builddir)/src/egl/<wbr>wayland/wayland-drm \<br>
- -I$(top_srcdir)/src/egl/<wbr>wayland/wayland-drm \<br>
$(WAYLAND_CFLAGS) \<br>
-DVK_USE_PLATFORM_WAYLAND_KHR<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.7.4<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>