[Mesa-dev] [PATCH 08/29] trace: consolidate C sources list into Makefile.sources

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/drivers/trace/Makefile.am      | 8 ++------
 src/gallium/drivers/trace/Makefile.sources | 6 ++++++
 src/gallium/drivers/trace/SConscript       | 9 ++-------
 3 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 src/gallium/drivers/trace/Makefile.sources

diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
index 984ead4..db5904d 100644
--- a/src/gallium/drivers/trace/Makefile.am
+++ b/src/gallium/drivers/trace/Makefile.am
@@ -1,3 +1,4 @@
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -6,9 +7,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libtrace.la
 
-libtrace_la_SOURCES = \
-	tr_context.c \
-	tr_dump.c \
-	tr_dump_state.c \
-	tr_screen.c \
-	tr_texture.c
+libtrace_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/trace/Makefile.sources b/src/gallium/drivers/trace/Makefile.sources
new file mode 100644
index 0000000..d325739
--- /dev/null
+++ b/src/gallium/drivers/trace/Makefile.sources
@@ -0,0 +1,6 @@
+C_SOURCES := \
+	tr_context.c \
+	tr_dump.c \
+	tr_dump_state.c \
+	tr_screen.c \
+	tr_texture.c
diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript
index 1384fe3..7341d1c 100644
--- a/src/gallium/drivers/trace/SConscript
+++ b/src/gallium/drivers/trace/SConscript
@@ -4,13 +4,8 @@ env = env.Clone()
 
 trace = env.ConvenienceLibrary(
     target = 'trace',
-    source = [
-        'tr_context.c',
-        'tr_dump.c',
-        'tr_dump_state.c',
-        'tr_screen.c',
-        'tr_texture.c',
-    ])
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+    )
 
 env.Alias('trace', trace)
 
-- 
1.8.4