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 <emil.l.velikov@gmail.com>

diff --git a/configure.ac b/configure.ac
index be4e5d287de038439f791848f0e0c0cb095d9cad..6087e05435876f2e58222fbc324ca81eb3472da2 100644 (file)
--- 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 3cefb2ff6f927aa6ff8c14a41dc5315147315299..6018e9f725370a73df7645d539e9867bcf20e13e 100644 (file)
--- 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 493d306f61489e2fe3818f643f0e53d0e6a8a574..4d8ba89cc98dbea70147474b7a0d1b5710c948eb 100644 (file)
--- 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 9bfaa0eabfc56817c61ca5beafb0fc7a57afe3a7..58d8af71f7fe4e30daa946aff836b3fbc8607e3c 100644 (file)
--- 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 ccdbea56d7a7abc39b147cd928aff0c106b823b6..1204c79e13449e5e50a67900f7496d73b98a80f7 100644 (file)
--- 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