diff options
| author | Emil Velikov <[email protected]> | 2014-04-01 17:42:41 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-04-25 21:09:17 +0100 |
| commit | 6c44d43baed93058f3a778f485f7833e9c6f5307 (patch) | |
| tree | 562c67fb6d870973e90675b480460c79209ec00b /src | |
| parent | 5c6a1445d530d5c070d1c5288dddf59884c7fca8 (diff) | |
automake: cleanup pipe-loader handling when using sw/xlib winsys
Rather than defining our own set of variables, use NEED_WINSYS_XLIB
and based on it include the sw/xlib winsys.
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/xa/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 3b7929066b1..0bd1d68ca69 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -56,7 +56,7 @@ gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index f23c26b3301..29909da29f2 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -37,7 +37,7 @@ lib@OPENCL_LIBNAME@_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB lib@OPENCL_LIBNAME@_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 4b351d907bb..2619e57e142 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -53,7 +53,7 @@ libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index 9381429bd6c..3c26cd36c06 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -18,7 +18,7 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(GALLIUM_COMMON_LIB_DEPS) -if NEED_PIPE_LOADER_XLIB +if NEED_WINSYS_XLIB LDADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ -lX11 -lXext -lXfixes \ |