summaryrefslogtreecommitdiffstats
path: root/src/gallium/tests
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-06-09 23:37:19 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-06-19 12:40:01 +0100
commitd22b39e4db7d1c54461de97ff4dcb79178be1a84 (patch)
treec6ceebfc75c3b4ddf2187a43e6bb82320d58b065 /src/gallium/tests
parent571b2467cad3f964046532e12dbdae258d4152df (diff)
downloadexternal_mesa3d-d22b39e4db7d1c54461de97ff4dcb79178be1a84.zip
external_mesa3d-d22b39e4db7d1c54461de97ff4dcb79178be1a84.tar.gz
external_mesa3d-d22b39e4db7d1c54461de97ff4dcb79178be1a84.tar.bz2
targets: use GALLIUM_PIPE_LOADER_WINSYS_LIB_DEPS
Drop ~50 lines of buildsystem mayhem. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium/tests')
-rw-r--r--src/gallium/tests/trivial/Makefile.am17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 8a8fad1..183fe8e 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -11,24 +11,13 @@ AM_CPPFLAGS = \
-DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \
$(GALLIUM_PIPE_LOADER_DEFINES)
-LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
+LDADD = \
+ $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
- $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(GALLIUM_COMMON_LIB_DEPS)
-if HAVE_DRISW
-LDADD += \
- $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
-endif
-
-if NEED_WINSYS_XLIB
-LDADD += \
- $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
- -lX11 -lXext -lXfixes \
- $(LIBDRM_LIBS)
-endif
-
noinst_PROGRAMS = compute tri quad-tex
compute_SOURCES = compute.c