aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-05-08 23:44:15 +0100
committerTom Stellard <[email protected]>2013-10-01 07:29:50 -0700
commitb91a9cdeaac251dfd8ec46b07755176c14110727 (patch)
tree6a2e98768c52359e31b6c692c38b1281c75d0e70
parente36912670920a8cf90b9da21eaf0b196ec8cf021 (diff)
trace: consolidate C sources list into Makefile.sources
Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tom Stellard <[email protected]>
-rw-r--r--src/gallium/drivers/trace/Makefile.am8
-rw-r--r--src/gallium/drivers/trace/Makefile.sources6
-rw-r--r--src/gallium/drivers/trace/SConscript9
3 files changed, 10 insertions, 13 deletions
diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
index 984ead4d7ab..db5904d23e6 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 00000000000..d325739913d
--- /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 1384fe33d72..7341d1c1c1d 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)