[Mesa-dev] [PATCH 1/2] anv: automake: use the local headers over any system provided ones

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

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

Thus, if one does inclemental 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, but in either case the more robust thing is to rely on our own
copy.

Cc: 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>
---
Grazvydas, since I butchered if while trying to explain myself I went
ahead and addressed the problem. Please double-check on your end.

Thanks
---
 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 185780246e2..7aacdf4e094 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -85,6 +85,7 @@ VULKAN_CFLAGS = \
 	-msse2
 
 VULKAN_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/compiler \
 	-I$(top_srcdir)/src/intel/compiler \
 	-I$(top_builddir)/src/intel/vulkan \
@@ -92,8 +93,7 @@ VULKAN_CPPFLAGS = \
 	-I$(top_srcdir)/src/vulkan/wsi \
 	-I$(top_builddir)/src/vulkan/util \
 	-I$(top_srcdir)/src/vulkan/util \
-	$(LIBDRM_CFLAGS) \
-	$(AM_CPPFLAGS)
+	$(LIBDRM_CFLAGS)
 
 vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS)
 vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70
-- 
2.11.1