fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

build: Build pipe-loader before gallium tests

Browse source 
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>
This commit is contained in:
Matt Turner 2013-01-20 12:54:31 -08:00
parent 0d3b1b0e2e
commit 2f7a37d858
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1397,10 +1397,6 @@ if test "x$enable_opencl" = xyes; then
fi fi
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes) 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
dnl Gallium configuration dnl Gallium configuration
dnl dnl
@ -1666,6 +1662,10 @@ if test "x$enable_gallium_tests" = xyes; then
fi fi
AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) 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 dnl Directory for VDPAU libs
AC_ARG_WITH([vdpau-libdir], AC_ARG_WITH([vdpau-libdir],
[AS_HELP_STRING([--with-vdpau-libdir=DIR], [AS_HELP_STRING([--with-vdpau-libdir=DIR],

3
src/gallium/targets/opencl/Makefile.am
View file

@ -32,11 +32,8 @@ libOpenCL_la_SOURCES =
# Force usage of a C++ linker # Force usage of a C++ linker
nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp 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 # 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. # a while by putting a link to the driver into /lib of the build tree.
all-local: libOpenCL.la all-local: libOpenCL.la
@$(MAKE) -C $(PIPE_BUILD_DIR)
$(MKDIR_P) $(top_builddir)/$(LIB_DIR) $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/ ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/

4
src/gallium/tests/trivial/Makefile.am
View file

@ -26,9 +26,5 @@ tri_SOURCES = tri.c
quad_tex_SOURCES = quad-tex.c quad_tex_SOURCES = quad-tex.c
all-local:
@$(MAKE) -C $(PIPE_SRC_DIR)
clean-local: clean-local:
@$(MAKE) -C $(PIPE_SRC_DIR) clean
-rm -f result.bmp -rm -f result.bmp