summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-05-27 15:35:32 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-30 10:28:46 +0100
commitb4f6c703973375670ea42ea289519df7770892b9 (patch)
treef2a84a6ebbd7bcd3b076352e9ad162ffd8b36d10
parent53a2167e68f27dd8bed26cba92b978fe1d6d4188 (diff)
isl: automake: list builddir before srcdir in the includes list
As seen elsewhere - we want to include the freshly built sources as opposed the the (likely) stale ones in the srcdir. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
-rw-r--r--src/intel/isl/Makefile.am7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 57313baa4f2..46b2683b4ab 100644
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -34,16 +34,15 @@ AM_CPPFLAGS = \
$(VALGRIND_CFLAGS) \
$(DEFINES) \
-I$(top_srcdir)/include \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src \
+ -I$(top_builddir)/src/intel \
-I$(top_srcdir)/src/intel \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/i965 \
-I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/gallium/include \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/intel
+ -I$(top_srcdir)/src/gallium/include
libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init