summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-09-08 23:52:47 +0100
committerEmil Velikov <[email protected]>2014-09-09 19:45:24 +0100
commit3d8b53ffb4ce4feff8326a62354386c9bc0bca27 (patch)
tree75261d6336092c0845587fffd1ffad0cc2c363d4 /src/gallium/auxiliary
parent44ec468e8033553c26a112cebba41c343db00eb1 (diff)
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 <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/Makefile.am4
-rw-r--r--src/gallium/auxiliary/Makefile.sources2
-rw-r--r--src/gallium/auxiliary/pipe-loader/Makefile.am7
3 files changed, 5 insertions, 8 deletions
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