diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-09 23:37:19 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-19 12:40:01 +0100 |
| commit | d22b39e4db7d1c54461de97ff4dcb79178be1a84 (patch) | |
| tree | c6ceebfc75c3b4ddf2187a43e6bb82320d58b065 /src/gallium/targets/opencl | |
| parent | 571b2467cad3f964046532e12dbdae258d4152df (diff) | |
| download | external_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/targets/opencl')
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 7f2854d..80b7e67 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = subdir-objects +include $(top_srcdir)/src/gallium/Automake.inc + lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la lib@OPENCL_LIBNAME@_la_LDFLAGS = \ @@ -15,11 +17,11 @@ lib@OPENCL_LIBNAME@_la_LDFLAGS += \ endif lib@OPENCL_LIBNAME@_la_LIBADD = \ + $(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/state_trackers/clover/libclover.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ -ldl \ -lclangCodeGen \ -lclangFrontendTool \ @@ -36,18 +38,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \ -lclangBasic \ $(LLVM_LIBS) -if HAVE_DRISW -lib@OPENCL_LIBNAME@_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la -endif - -if NEED_WINSYS_XLIB -lib@OPENCL_LIBNAME@_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ - -lX11 -lXext -lXfixes \ - $(LIBDRM_LIBS) -endif - nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp lib@OPENCL_LIBNAME@_la_SOURCES = |