noop: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>

4 files changed, 23 insertions, 17 deletions

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index c75fb82375d..3f7621d601b 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = $(VISIBILITY_CFLAGS)
 
 noinst_LTLIBRARIES =
 
-SUBDIRS = . identity trace rbug
+SUBDIRS = . identity noop trace rbug
 
 ################################################################################
 
@@ -24,17 +24,6 @@ galahad_libgalahad_la_SOURCES = \
 
 ################################################################################
 
-# Meta-driver which combines whichever software rasterizers have been
-# built into a single convenience library.
-
-noinst_LTLIBRARIES += noop/libnoop.la
-
-noop_libnoop_la_SOURCES = \
-	noop/noop_pipe.c \
-	noop/noop_state.c
-
-################################################################################
-
 if HAVE_GALLIUM_R600
 
 SUBDIRS += radeon
diff --git a/src/gallium/drivers/noop/Makefile.am b/src/gallium/drivers/noop/Makefile.am
new file mode 100644
index 00000000000..1f4ba028f7f
--- /dev/null
+++ b/src/gallium/drivers/noop/Makefile.am
@@ -0,0 +1,16 @@
+################################################################################
+
+# Meta-driver which combines whichever software rasterizers have been
+# built into a single convenience library.
+
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
+
+noinst_LTLIBRARIES = libnoop.la
+
+libnoop_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/noop/Makefile.sources b/src/gallium/drivers/noop/Makefile.sources
new file mode 100644
index 00000000000..916385e2d24
--- /dev/null
+++ b/src/gallium/drivers/noop/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	noop_pipe.c \
+	noop_state.c
diff --git a/src/gallium/drivers/noop/SConscript b/src/gallium/drivers/noop/SConscript
index a4d0dcaf270..9cb2e29cbe3 100644
--- a/src/gallium/drivers/noop/SConscript
+++ b/src/gallium/drivers/noop/SConscript
@@ -7,9 +7,7 @@ env = env.Clone()
 
 noop = env.ConvenienceLibrary(
 	target = 'noop',
-	source = [
-		'noop_pipe.c',
-		'noop_state.c'
-		]
-    ) + extra
+	source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+	) + extra
+
 Export('noop')