And don't build it from other Makefiles. That's awful, and breaks
distclean.
---
configure.ac | 8 ++++----
src/gallium/targets/opencl/Makefile.am | 3 ---
src/gallium/tests/trivial/Makefile.am | 7 -------
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index c8de531..dbe72c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,10 +1435,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
@@ -1693,6 +1689,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 c5c3003..da33788 100644
--- 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_SRC_DIR = $(top_srcdir)/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_SRC_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 e6e9ae7..32a1299 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -25,10 +25,3 @@ compute_SOURCES = compute.c
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
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
