Mesa (master): build: Remove libws_null.la from GALLIUM_PIPE_LOADER_LIBS.
Matt Turner
mattst88 at kemper.freedesktop.org
Tue Apr 30 21:06:24 UTC 2013
Module: Mesa
Branch: master
Commit: ea6caf4cdf524f83d22b5bd062773301c22e793e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea6caf4cdf524f83d22b5bd062773301c22e793e
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Apr 22 12:07:13 2013 -0700
build: Remove libws_null.la from GALLIUM_PIPE_LOADER_LIBS.
Tested-by: Tom Stellard <thomas.stellard at amd.com>
Tested-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
configure.ac | 1 -
src/gallium/targets/gbm/Makefile.am | 1 +
src/gallium/targets/opencl/Makefile.am | 1 +
src/gallium/tests/trivial/Makefile.am | 1 +
4 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7cad3cb..6567f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1915,7 +1915,6 @@ if test "x$enable_gallium_loader" = xyes; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null"
GALLIUM_PIPE_LOADER_DEFINES="-DHAVE_PIPE_LOADER_SW"
GALLIUM_PIPE_LOADER_LIBS="\$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la"
- GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la"
if test "x$NEED_WINSYS_XLIB" = xyes; then
GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la"
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index 278e4fa..ee66f9d 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -43,6 +43,7 @@ gbm_gallium_drm_la_SOURCES = gbm.c
gbm_gallium_drm_la_LIBADD = \
$(GALLIUM_PIPE_LOADER_LIBS) \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(LIBUDEV_LIBS) \
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 4b77d0a..9947aec 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -7,6 +7,7 @@ libOpenCL_la_LDFLAGS = \
-version-number 1:0
libOpenCL_la_LIBADD = \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 705a878..6f34d3b 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES)
LDADD = $(GALLIUM_PIPE_LOADER_LIBS) \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(LIBUDEV_LIBS) \
$(DLOPEN_LIBS) \
More information about the mesa-commit
mailing list