summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-04-15 15:32:18 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-04-21 20:44:27 -0700
commitef5dca2034b347eb676a973be0702e8796a59174 (patch)
tree0f448c2de51a631c9c0aae4aa8fe9b479d68ba10 /src/Makefile.am
parentfe3b1e14480f303614c9c834f54615e75ec2392a (diff)
i965: Add a dependency on libisl
To avoid build issues, ensure that you're running `make' at the top level and/or you've executed `make clean' beforehand. Reviewed-by: Chad Versace <chad.versace@intel.com>
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a0572b7a56..1471fa0e48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,10 +24,19 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
# include only conditionally ?
SUBDIRS += compiler
+if HAVE_INTEL_DRIVERS
+SUBDIRS += intel
+endif
+
if NEED_OPENGL_COMMON
SUBDIRS += mesa
endif
+# This explicitly comes after mesa because it depends on the i965 compiler
+if HAVE_INTEL_VULKAN
+SUBDIRS += intel/vulkan
+endif
+
SUBDIRS += loader
if HAVE_DRI_GLX
@@ -56,10 +65,6 @@ EXTRA_DIST = \
AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
-if HAVE_INTEL_DRIVERS
-SUBDIRS += intel
-endif
-
AM_CPPFLAGS = \
-I$(top_srcdir)/include/ \
-I$(top_srcdir)/src/mapi/ \