summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-05-08 23:34:36 +0100
committerTom Stellard <[email protected]>2013-10-01 07:29:49 -0700
commit2234e187c6fb09b1750b00756b5a3a4481be7415 (patch)
treea9c9478f60631795de7e31ef9711d135495d757a
parent9bc5ced1c7940820ce59d5e4bd2ca6a48b643e1d (diff)
rbug: 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/rbug/Makefile.am7
-rw-r--r--src/gallium/drivers/rbug/Makefile.sources5
-rw-r--r--src/gallium/drivers/rbug/SConscript8
3 files changed, 9 insertions, 11 deletions
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)