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 e5762762b234a300025e406c5679a6e45cfee2fd..310e0a7c7a02290aad7ca111de1ed8342479e018 100644 (file)
--- 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 ff0334a2396ce575aa30ae2eed258bb3843e8b00..5b4ed5df2b996b8d5d57abda6a0a7bb91ed8068c 100644 (file)
--- 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 d65bf20e26d6186b98313fc1d5d60e2c0a74bd9c..4c7dd843da57d1f74215ceca67134b89c07ce5bf 100644 (file)
--- 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) \