KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2015-06-29 13:08:06 +01:00
parent abc20120e4
commit c73d30dfe9
11 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2245,7 +2245,6 @@ if test "x$enable_gallium_loader" = xyes; then
fi fi
AC_SUBST([GALLIUM_PIPE_LOADER_DEFINES]) AC_SUBST([GALLIUM_PIPE_LOADER_DEFINES])
AC_SUBST([GALLIUM_PIPE_LOADER_LIBS])
fi fi
AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes) AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)

3
src/gallium/auxiliary/pipe-loader/Makefile.am
View File

@ -14,9 +14,6 @@ noinst_LTLIBRARIES = libpipe_loader.la
libpipe_loader_la_SOURCES = \ libpipe_loader_la_SOURCES = \
$(COMMON_SOURCES) $(COMMON_SOURCES)
libpipe_loader_la_LIBADD = $(COMMON_LIBADD) \
$(GALLIUM_PIPE_LOADER_LIBS)
if HAVE_DRM_LOADER_GALLIUM if HAVE_DRM_LOADER_GALLIUM
AM_CFLAGS += \ AM_CFLAGS += \
$(LIBDRM_CFLAGS) $(LIBDRM_CFLAGS)

3
src/gallium/targets/d3dadapter9/Makefile.am
View File

@ -118,8 +118,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
d3dadapter9_la_LIBADD += \ d3dadapter9_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

3
src/gallium/targets/dri/Makefile.am
View File

@ -95,8 +95,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
gallium_dri_la_LIBADD += \ gallium_dri_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

3
src/gallium/targets/omx/Makefile.am
View File

@ -57,8 +57,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libomx_mesa_la_LIBADD += \ libomx_mesa_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

1
src/gallium/targets/opencl/Makefile.am
View File

@ -20,7 +20,6 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(GALLIUM_PIPE_LOADER_LIBS) \
$(ELF_LIB) \ $(ELF_LIB) \
-ldl \ -ldl \
-lclangCodeGen \ -lclangCodeGen \

3
src/gallium/targets/va/Makefile.am
View File

@ -54,8 +54,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
gallium_drv_video_la_LIBADD += \ gallium_drv_video_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

3
src/gallium/targets/vdpau/Makefile.am
View File

@ -66,8 +66,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_LIBADD += \ libvdpau_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

3
src/gallium/targets/xa/Makefile.am
View File

@ -81,8 +81,7 @@ else # HAVE_GALLIUM_STATIC_TARGETS
libxatracker_la_LIBADD += \ libxatracker_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

4
src/gallium/targets/xvmc/Makefile.am
View File

@ -52,11 +52,9 @@ libXvMCgallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS else # HAVE_GALLIUM_STATIC_TARGETS
# XXX: Use the pipe-loader-client over pipe-loader ?
libXvMCgallium_la_LIBADD += \ libXvMCgallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
$(GALLIUM_PIPE_LOADER_LIBS)
endif # HAVE_GALLIUM_STATIC_TARGETS endif # HAVE_GALLIUM_STATIC_TARGETS

1
src/gallium/tests/trivial/Makefile.am
View File

@ -16,7 +16,6 @@ LDADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(GALLIUM_PIPE_LOADER_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS) $(GALLIUM_COMMON_LIB_DEPS)
noinst_PROGRAMS = compute tri quad-tex noinst_PROGRAMS = compute tri quad-tex