summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-04-22 12:07:13 -0700
committerMatt Turner <mattst88@gmail.com>2013-04-30 14:03:32 -0700
commitea6caf4cdf524f83d22b5bd062773301c22e793e (patch)
tree42e56066954f2003f80c31cb796fe4a0a53d4dbc /src/gallium
parent242809942fd54b23a61fffdd0b1ba443f11c2bf6 (diff)
downloadexternal_mesa3d-ea6caf4cdf524f83d22b5bd062773301c22e793e.zip
external_mesa3d-ea6caf4cdf524f83d22b5bd062773301c22e793e.tar.gz
external_mesa3d-ea6caf4cdf524f83d22b5bd062773301c22e793e.tar.bz2
build: Remove libws_null.la from GALLIUM_PIPE_LOADER_LIBS.
Tested-by: Tom Stellard <thomas.stellard@amd.com> Tested-by: Aaron Watry <awatry@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/targets/gbm/Makefile.am1
-rw-r--r--src/gallium/targets/opencl/Makefile.am1
-rw-r--r--src/gallium/tests/trivial/Makefile.am1
3 files changed, 3 insertions, 0 deletions
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) \