rbug: 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/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am
index 3c1a8b5f875cd0d938e92b85388362e4b5d027a7..1aa65214100c7ea0353610e73a297d7e352ab407 100644 (file)
--- 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 (file)
index 0000000..32a18f6
--- /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 169c2718dc35005a761e07399ec0b5a82c830840..63209abac2e83102b1caa93a787ae9578adf538e 100644 (file)
--- 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)