targets: use GALLIUM_PIPE_LOADER_WINSYS_LIB_DEPS
Drop ~50 lines of buildsystem mayhem. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
571b2467ca
commit
d22b39e4db
|
@ -44,25 +44,13 @@ gbm_gallium_drm_la_SOURCES = gbm.c
|
||||||
|
|
||||||
gbm_gallium_drm_la_LIBADD = \
|
gbm_gallium_drm_la_LIBADD = \
|
||||||
$(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
|
$(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/auxiliary/pipe-loader/libpipe_loader_client.la \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
|
||||||
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
|
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
$(GALLIUM_COMMON_LIB_DEPS)
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
|
|
||||||
if HAVE_DRISW
|
|
||||||
gbm_gallium_drm_la_LIBADD += \
|
|
||||||
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
|
|
||||||
endif
|
|
||||||
|
|
||||||
if NEED_WINSYS_XLIB
|
|
||||||
gbm_gallium_drm_la_LIBADD += \
|
|
||||||
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
|
|
||||||
-lX11 -lXext -lXfixes \
|
|
||||||
$(LIBDRM_LIBS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
gbm_gallium_drm_la_LDFLAGS = \
|
gbm_gallium_drm_la_LDFLAGS = \
|
||||||
-module \
|
-module \
|
||||||
-no-undefined \
|
-no-undefined \
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
AUTOMAKE_OPTIONS = subdir-objects
|
AUTOMAKE_OPTIONS = subdir-objects
|
||||||
|
|
||||||
|
include $(top_srcdir)/src/gallium/Automake.inc
|
||||||
|
|
||||||
lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la
|
lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la
|
||||||
|
|
||||||
lib@OPENCL_LIBNAME@_la_LDFLAGS = \
|
lib@OPENCL_LIBNAME@_la_LDFLAGS = \
|
||||||
|
@ -15,11 +17,11 @@ lib@OPENCL_LIBNAME@_la_LDFLAGS += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
lib@OPENCL_LIBNAME@_la_LIBADD = \
|
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/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/state_trackers/clover/libclover.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
|
|
||||||
-ldl \
|
-ldl \
|
||||||
-lclangCodeGen \
|
-lclangCodeGen \
|
||||||
-lclangFrontendTool \
|
-lclangFrontendTool \
|
||||||
|
@ -36,18 +38,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
|
||||||
-lclangBasic \
|
-lclangBasic \
|
||||||
$(LLVM_LIBS)
|
$(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
|
nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
|
||||||
lib@OPENCL_LIBNAME@_la_SOURCES =
|
lib@OPENCL_LIBNAME@_la_SOURCES =
|
||||||
|
|
||||||
|
|
|
@ -41,25 +41,13 @@ libxatracker_la_SOURCES =
|
||||||
|
|
||||||
libxatracker_la_LIBADD = \
|
libxatracker_la_LIBADD = \
|
||||||
$(GALLIUM_PIPE_LOADER_LIBS) \
|
$(GALLIUM_PIPE_LOADER_LIBS) \
|
||||||
|
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
|
||||||
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
|
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
|
||||||
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
|
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
$(GALLIUM_COMMON_LIB_DEPS)
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
|
|
||||||
if HAVE_DRISW
|
|
||||||
libxatracker_la_LIBADD += \
|
|
||||||
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
|
|
||||||
endif
|
|
||||||
|
|
||||||
if NEED_WINSYS_XLIB
|
|
||||||
libxatracker_la_LIBADD += \
|
|
||||||
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
|
|
||||||
-lX11 -lXext -lXfixes \
|
|
||||||
$(LIBDRM_LIBS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
libxatracker_la_LDFLAGS = \
|
libxatracker_la_LDFLAGS = \
|
||||||
-no-undefined \
|
-no-undefined \
|
||||||
-version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \
|
-version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \
|
||||||
|
|
|
@ -11,24 +11,13 @@ AM_CPPFLAGS = \
|
||||||
-DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \
|
-DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \
|
||||||
$(GALLIUM_PIPE_LOADER_DEFINES)
|
$(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/auxiliary/pipe-loader/libpipe_loader_client.la \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(GALLIUM_COMMON_LIB_DEPS)
|
$(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
|
noinst_PROGRAMS = compute tri quad-tex
|
||||||
|
|
||||||
compute_SOURCES = compute.c
|
compute_SOURCES = compute.c
|
||||||
|
|
Loading…
Reference in New Issue