From: Eric Anholt <eric@anholt.net>
Date: Tue, 5 Jun 2018 15:50:55 +0000 (-0700)
Subject: v3d: Be more explicit about include directory from our generated code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b1b2cbf619f9b3d578dabb0956bd5a248b6a89c;p=mesa.git

v3d: Be more explicit about include directory from our generated code.

You'd need src/broadcom/cle/ in the -I previously, for srcdir != builddir.
nir was fine at that, but automake didn't have it.

Bugzilla: https://github.com/anholt/mesa/issues/104
---

diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py
index e5762762b23..310e0a7c7a0 100644
--- a/src/broadcom/cle/gen_pack_header.py
+++ b/src/broadcom/cle/gen_pack_header.py
@@ -43,7 +43,7 @@ pack_header = """%(license)s
 #ifndef %(guard)s
 #define %(guard)s
 
-#include "v3d_packet_helpers.h"
+#include "cle/v3d_packet_helpers.h"
 
 """
 
diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
index ff0334a2396..5b4ed5df2b9 100644
--- a/src/gallium/drivers/v3d/Makefile.am
+++ b/src/gallium/drivers/v3d/Makefile.am
@@ -25,7 +25,9 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)/src/broadcom \
 	-I$(top_builddir)/src/broadcom \
+	-I$(top_builddir)/src \
 	$(LIBDRM_CFLAGS) \
 	$(V3D_SIMULATOR_CFLAGS) \
 	$(GALLIUM_DRIVER_CFLAGS) \
diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am
index d65bf20e26d..4c7dd843da5 100644
--- a/src/gallium/drivers/vc4/Makefile.am
+++ b/src/gallium/drivers/vc4/Makefile.am
@@ -30,7 +30,8 @@ AM_CFLAGS = \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/include/drm-uapi \
 	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src/broadcom/cle \
+	-I$(top_srcdir)/src/broadcom \
+	-I$(top_builddir)/src/broadcom \
 	$(LIBDRM_CFLAGS) \
 	$(GALLIUM_DRIVER_CFLAGS) \
 	$(SIM_CFLAGS) \