Mesa (master): pipe-loader: consolidate sources into Makefile.sources

[Emil Velikov]

Module: Mesa
Branch: master
Commit: dfa61dc37e2aa497279030321eb8c7d539d68c79
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfa61dc37e2aa497279030321eb8c7d539d68c79

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Oct 14 17:44:12 2014 +0100

pipe-loader: consolidate sources into Makefile.sources

Drop the unneeded subdir-objects.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/auxiliary/pipe-loader/Makefile.am      |   10 ++--------
 src/gallium/auxiliary/pipe-loader/Makefile.sources |    8 ++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
index 1204c79..44917f3 100644
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = subdir-objects
+include Makefile.sources
 
 AM_CPPFLAGS = $(DEFINES) \
 	$(VISIBILITY_CFLAGS) \
@@ -11,16 +11,10 @@ AM_CPPFLAGS = $(DEFINES) \
 noinst_LTLIBRARIES = libpipe_loader.la
 noinst_LTLIBRARIES += libpipe_loader_client.la
 
-COMMON_SOURCES = \
-	pipe_loader.h \
-	pipe_loader_priv.h \
-	pipe_loader.c \
-	pipe_loader_sw.c
-
 if HAVE_DRM_LOADER_GALLIUM
 AM_CFLAGS = $(LIBDRM_CFLAGS)
 
-COMMON_SOURCES += pipe_loader_drm.c
+COMMON_SOURCES += $(DRM_SOURCES)
 
 COMMON_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.sources b/src/gallium/auxiliary/pipe-loader/Makefile.sources
new file mode 100644
index 0000000..d6e3c2c
--- /dev/null
+++ b/src/gallium/auxiliary/pipe-loader/Makefile.sources
@@ -0,0 +1,8 @@
+COMMON_SOURCES := \
+	pipe_loader.c \
+	pipe_loader.h \
+	pipe_loader_priv.h \
+	pipe_loader_sw.c
+
+DRM_SOURCES := \
+	pipe_loader_drm.c