From 2234e187c6fb09b1750b00756b5a3a4481be7415 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 8 May 2013 23:34:36 +0100 Subject: [PATCH] rbug: consolidate C sources list into Makefile.sources Signed-off-by: Emil Velikov Reviewed-by: Tom Stellard --- src/gallium/drivers/rbug/Makefile.am | 7 ++----- src/gallium/drivers/rbug/Makefile.sources | 5 +++++ src/gallium/drivers/rbug/SConscript | 8 ++------ 3 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 src/gallium/drivers/rbug/Makefile.sources diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am index 3c1a8b5f875..1aa65214100 100644 --- a/src/gallium/drivers/rbug/Makefile.am +++ b/src/gallium/drivers/rbug/Makefile.am @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc noinst_LTLIBRARIES = librbug.la @@ -34,8 +35,4 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include -librbug_la_SOURCES = \ - rbug_core.c \ - rbug_context.c \ - rbug_objects.c \ - rbug_screen.c +librbug_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/rbug/Makefile.sources b/src/gallium/drivers/rbug/Makefile.sources new file mode 100644 index 00000000000..32a18f61270 --- /dev/null +++ b/src/gallium/drivers/rbug/Makefile.sources @@ -0,0 +1,5 @@ +C_SOURCES := \ + rbug_core.c \ + rbug_context.c \ + rbug_objects.c \ + rbug_screen.c diff --git a/src/gallium/drivers/rbug/SConscript b/src/gallium/drivers/rbug/SConscript index 169c2718dc3..63209abac2e 100644 --- a/src/gallium/drivers/rbug/SConscript +++ b/src/gallium/drivers/rbug/SConscript @@ -4,12 +4,8 @@ env = env.Clone() rbug = env.ConvenienceLibrary( target = 'rbug', - source = [ - 'rbug_context.c', - 'rbug_core.c', - 'rbug_objects.c', - 'rbug_screen.c', - ]) + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') + ) env.Alias('rbug', rbug) -- 2.30.2