diff options
| author | Matt Turner <[email protected]> | 2013-01-20 12:54:31 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-04-15 12:05:55 -0700 |
| commit | 2f7a37d858ecafa51e70eb8aeb9b7cfcfaf2fa0e (patch) | |
| tree | 7f8ebcc811f8a5eba492efb3d238d53d011846aa | |
| parent | 0d3b1b0e2eb9212d95cd590848b059ebdae46da9 (diff) | |
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 <[email protected]>
Reviewed-and-Tested-by: Andreas Boll <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/Makefile.am | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index de51b17c018..805a355729d 100644 --- 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 810f9bbeb22..4b77d0a03e4 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_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 e6e9ae73d12..705a8786eb0 100644 --- 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 |