From 3d8b53ffb4ce4feff8326a62354386c9bc0bca27 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 8 Sep 2014 23:52:47 +0100 Subject: [PATCH] automake: remove obsolete NEED_GALLIUM_LOADER Superseded by HAVE_LOADER_GALLIUM. The latter has a *DRM* brethren making the whose easier on which one to keep. Signed-off-by: Emil Velikov --- configure.ac | 1 - src/gallium/Makefile.am | 2 +- src/gallium/auxiliary/Makefile.am | 4 ++++ src/gallium/auxiliary/Makefile.sources | 2 -- src/gallium/auxiliary/pipe-loader/Makefile.am | 7 +------ 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index be4e5d287de..6087e054358 100644 --- a/configure.ac +++ b/configure.ac @@ -1794,7 +1794,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) if test "x$enable_gallium_loader" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader" fi -AM_CONDITIONAL(NEED_GALLIUM_LOADER, test "x$enable_gallium_loader" = xyes) dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 3cefb2ff6f9..6018e9f7253 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -121,7 +121,7 @@ EXTRA_DIST = \ ## Gallium state trackers and their users (targets) ## -if NEED_GALLIUM_LOADER +if HAVE_LOADER_GALLIUM SUBDIRS += targets/pipe-loader endif diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 493d306f614..4d8ba89cc98 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -1,5 +1,9 @@ AUTOMAKE_OPTIONS = subdir-objects +if HAVE_LOADER_GALLIUM +SUBDIRS := pipe-loader +endif + include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 9bfaa0eabfc..58d8af71f7f 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -1,5 +1,3 @@ -SUBDIRS := pipe-loader - C_SOURCES := \ cso_cache/cso_cache.c \ cso_cache/cso_context.c \ diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am index ccdbea56d7a..1204c79e134 100644 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -8,10 +8,7 @@ AM_CPPFLAGS = $(DEFINES) \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/winsys -noinst_LTLIBRARIES = - -if HAVE_LOADER_GALLIUM -noinst_LTLIBRARIES += libpipe_loader.la +noinst_LTLIBRARIES = libpipe_loader.la noinst_LTLIBRARIES += libpipe_loader_client.la COMMON_SOURCES = \ @@ -43,5 +40,3 @@ libpipe_loader_client_la_CFLAGS = \ libpipe_loader_client_la_SOURCES = $(COMMON_SOURCES) libpipe_loader_client_la_LIBADD = $(COMMON_LIBADD) \ $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) - -endif -- 2.30.2