[Mesa-dev] [PATCH 01/13] i965: Add a dependency on libisl

[Jason Ekstrand]

---
 configure.ac                          | 3 ++-
 src/Makefile.am                       | 9 +++++++--
 src/intel/Makefile.am                 | 4 ----
 src/mesa/drivers/dri/i965/Makefile.am | 7 ++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9226a0d..e4ce8fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2459,7 +2459,8 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
 
 AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
 
-AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes)
+AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \
+                                        "x$HAVE_I965_DRI" = xyes)
 
 AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
                                             "x$HAVE_GALLIUM_R600" = xyes -o \
diff --git a/src/Makefile.am b/src/Makefile.am
index a0572b7..e9745d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,10 @@ 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
@@ -56,8 +60,9 @@ EXTRA_DIST = \
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
-if HAVE_INTEL_DRIVERS
-SUBDIRS += intel
+# This explicitly comes later because it depends on the i965 compiler
+if HAVE_INTEL_VULKAN
+SUBDIRS += intel/vulkan
 endif
 
 AM_CPPFLAGS = \
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index c3673c6..520602d 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -20,7 +20,3 @@
 # IN THE SOFTWARE.
 
 SUBDIRS = genxml isl
-
-if HAVE_INTEL_VULKAN
-SUBDIRS += vulkan
-endif
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index a41c830..1ed85af 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -34,6 +34,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_srcdir)/src/compiler/nir \
+	-I$(top_srcdir)/src/intel \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
@@ -48,13 +49,17 @@ brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compil
 
 noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
 libi965_dri_la_SOURCES = $(i965_FILES)
-libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS)
+libi965_dri_la_LIBADD = \
+	$(top_builddir)/src/intel/isl/libisl.la \
+	libi965_compiler.la \
+	$(INTEL_LIBS)
 
 libi965_compiler_la_SOURCES = $(i965_compiler_FILES)
 
 TEST_LIBS = \
 	libi965_compiler.la \
         ../../../libmesa.la \
+	$(top_builddir)/src/intel/isl/libisl.la \
 	$(PTHREAD_LIBS) \
 	$(DLOPEN_LIBS) \
 	../common/libdri_test_stubs.la
-- 
2.5.0.400.gff86faf