build: Build pipe-loader before gallium tests

And don't build it from other Makefiles. That's awful, and breaks
distclean.

Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/configure.ac b/configure.ac
index de51b17c018ef8dbe2b96c8430b5d9f941a936ed..805a355729d7ae327e04a06f5934fae881f3c916 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1397,10 +1397,6 @@ if test "x$enable_opencl" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
 
-if test "x$enable_gallium_gbm" = xyes || test "x$enable_opencl" = xyes; then
-    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader"
-fi
-
 dnl
 dnl Gallium configuration
 dnl
@@ -1666,6 +1662,10 @@ if test "x$enable_gallium_tests" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes)
 
+if test "x$enable_gallium_loader" = xyes; then
+    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader"
+fi
+
 dnl Directory for VDPAU libs
 AC_ARG_WITH([vdpau-libdir],
     [AS_HELP_STRING([--with-vdpau-libdir=DIR],

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 810f9bbeb22ca998485929d4f0d143a0f30e53a3..4b77d0a03e4c81011e7dda8d9545f973e45392ee 100644 (file)
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -32,11 +32,8 @@ libOpenCL_la_SOURCES =
 # Force usage of a C++ linker
 nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp
 
-PIPE_BUILD_DIR = $(top_builddir)/src/gallium/targets/pipe-loader
-
 # Provide compatibility with scripts for the old Mesa build system for
 # a while by putting a link to the driver into /lib of the build tree.
 all-local: libOpenCL.la
-       @$(MAKE) -C $(PIPE_BUILD_DIR)
        $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
        ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/

diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index e6e9ae73d12ae4b91308773af99eaa0e54871618..705a8786eb0425c011296e8c2140a8f5429c8f73 100644 (file)
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -26,9 +26,5 @@ tri_SOURCES = tri.c
 
 quad_tex_SOURCES = quad-tex.c
 
-all-local:
-       @$(MAKE) -C $(PIPE_SRC_DIR)
-
 clean-local:
-       @$(MAKE) -C $(PIPE_SRC_DIR) clean
        -rm -f result.bmp