summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-06-29 13:08:06 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-07-13 19:57:34 +0100
commitc73d30dfe90d9aa096fc64024612a6543bd748c7 (patch)
tree9da9e8df80dfae3620f30777c700467fa67364de
parentabc20120e4aa5a3782f40f7d4a7c6a4f953fca9c (diff)
automake: remove empty GALLIUM_PIPE_LOADER_LIBS
Cc: Rob Clark <robclark@freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net>
-rw-r--r--configure.ac1
-rw-r--r--src/gallium/auxiliary/pipe-loader/Makefile.am3
-rw-r--r--src/gallium/targets/d3dadapter9/Makefile.am3
-rw-r--r--src/gallium/targets/dri/Makefile.am3
-rw-r--r--src/gallium/targets/omx/Makefile.am3
-rw-r--r--src/gallium/targets/opencl/Makefile.am1
-rw-r--r--src/gallium/targets/va/Makefile.am3
-rw-r--r--src/gallium/targets/vdpau/Makefile.am3
-rw-r--r--src/gallium/targets/xa/Makefile.am3
-rw-r--r--src/gallium/targets/xvmc/Makefile.am4
-rw-r--r--src/gallium/tests/trivial/Makefile.am1
11 files changed, 7 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index 6926b6f986d..0d40e2f1a90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2245,7 +2245,6 @@ if test "x$enable_gallium_loader" = xyes; then
fi
AC_SUBST([GALLIUM_PIPE_LOADER_DEFINES])
- AC_SUBST([GALLIUM_PIPE_LOADER_LIBS])
fi
AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
index bcd49b5fce5..8c837996539 100644
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -14,9 +14,6 @@ noinst_LTLIBRARIES = libpipe_loader.la
libpipe_loader_la_SOURCES = \
$(COMMON_SOURCES)
-libpipe_loader_la_LIBADD = $(COMMON_LIBADD) \
- $(GALLIUM_PIPE_LOADER_LIBS)
-
if HAVE_DRM_LOADER_GALLIUM
AM_CFLAGS += \
$(LIBDRM_CFLAGS)
diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
index 591978f1f61..fe5b0b11679 100644
--- a/src/gallium/targets/d3dadapter9/Makefile.am
+++ b/src/gallium/targets/d3dadapter9/Makefile.am
@@ -118,8 +118,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
d3dadapter9_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 96483964589..7c86ea13652 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -95,8 +95,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
gallium_dri_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
index f52e66946ed..a4dff487dd8 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -57,8 +57,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libomx_mesa_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 6ea04d4ce5b..441b438d339 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -20,7 +20,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS) \
$(ELF_LIB) \
-ldl \
-lclangCodeGen \
diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
index 57c7e353ae9..9613f041b58 100644
--- a/src/gallium/targets/va/Makefile.am
+++ b/src/gallium/targets/va/Makefile.am
@@ -54,8 +54,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
gallium_drv_video_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 9455fc4cae5..7eb62c1cc78 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -66,8 +66,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
index 8ddb9672bd7..92173dedce3 100644
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -81,8 +81,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libxatracker_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index 3c16c8d51eb..b3285890822 100644
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -52,11 +52,9 @@ libXvMCgallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS
-# XXX: Use the pipe-loader-client over pipe-loader ?
libXvMCgallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS)
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 82cab5ee210..56b7f3ffc66 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -16,7 +16,6 @@ LDADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
- $(GALLIUM_PIPE_LOADER_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
noinst_PROGRAMS = compute tri quad-tex