noop: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/configure.ac b/configure.ac
index f88a0eeabaebca31bfa7b4f0e2eeab3985566c9d..899f20fc0543ed311d345626ca37300a7d433c93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2007,6 +2007,7 @@ AC_CONFIG_FILES([Makefile
                src/gallium/drivers/identity/Makefile
                src/gallium/drivers/ilo/Makefile
                src/gallium/drivers/llvmpipe/Makefile
+               src/gallium/drivers/noop/Makefile
                src/gallium/drivers/nouveau/Makefile
                src/gallium/drivers/r300/Makefile
                src/gallium/drivers/r600/Makefile

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index c75fb82375d5901fbf61bbcc69f00552f562059f..3f7621d601b662db84c9c1dbfbba027e8e11cf0f 100644 (file)
--- 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 (file)
index 0000000..1f4ba02
--- /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 (file)
index 0000000..916385e
--- /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 a4d0dcaf270f7603fa0260f2e25e1d9ed5b35457..9cb2e29cbe3274e2f1efd018d566468849b78416 100644 (file)
--- 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')