Mesa (master): anv: automake: use the local headers over any system provided ones

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 1fa6a33e4de112a8fa5f9b5b85c9463d18617ebe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa6a33e4de112a8fa5f9b5b85c9463d18617ebe

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon Mar 20 14:56:03 2017 +0000

anv: automake: use the local headers over any system provided ones

At the moment, we would honour any system headers - vulkan_intel.h in
particular over the ones in-tree.

Thus, if one does incremental build of mesa, without the vulkan.h
already installed (or at least not in the same directory as
vulkan_intel.h) the build will fail.

In the future we might want to upstream the vulkan_intel.h within
vulkan.h or use other ways to make vulkan_intel.h obsolete. In either
case, the more robust thing is to rely on our own copy.

v2: Move AM_CPPFLAGS just above LIBDRM_CFLAGS (Grazvydas, Jason)

Tested-by: Grazvydas Ignotas <notasas at gmail.com>
Fixes: ee8044fd "intel/vulkan: Get rid of recursive make"
Suggested-by: Jason Ekstrand <jason at jlekstrand.net>
Reported-by: Grazvydas Ignotas <notasas at gmail.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/Makefile.vulkan.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 185780246e..2815009876 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -92,8 +92,8 @@ VULKAN_CPPFLAGS = \
 	-I$(top_srcdir)/src/vulkan/wsi \
 	-I$(top_builddir)/src/vulkan/util \
 	-I$(top_srcdir)/src/vulkan/util \
-	$(LIBDRM_CFLAGS) \
-	$(AM_CPPFLAGS)
+	$(AM_CPPFLAGS) \
+	$(LIBDRM_CFLAGS)
 
 vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS)
 vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70