nouveau: share the source lists

For each driver, factor out C_SOURCES from Makefile to Makefile.sources,
and let Makefile and SConscript share it.

3 files changed, 26 insertions, 45 deletions

diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index a3b76ac61b1..53292d6da12 100644
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -3,28 +3,8 @@ include $(TOP)/configs/current
 
 LIBNAME = nvfx
 
-C_SOURCES = \
-	nv04_2d.c \
-	nvfx_buffer.c \
-	nvfx_context.c \
-	nvfx_clear.c \
-	nvfx_draw.c \
-	nvfx_fragprog.c \
-	nvfx_fragtex.c \
-	nv30_fragtex.c \
-	nv40_fragtex.c \
-	nvfx_miptree.c \
-	nvfx_push.c \
-	nvfx_query.c \
-	nvfx_resource.c \
-	nvfx_screen.c \
-	nvfx_state.c \
-	nvfx_state_emit.c \
-	nvfx_state_fb.c \
-	nvfx_surface.c \
-	nvfx_transfer.c \
-	nvfx_vbo.c \
-	nvfx_vertprog.c
+# get C_SOURCES
+include Makefile.sources
 
 LIBRARY_INCLUDES = \
 	$(LIBDRM_CFLAGS) \
diff --git a/src/gallium/drivers/nvfx/Makefile.sources b/src/gallium/drivers/nvfx/Makefile.sources
new file mode 100644
index 00000000000..31611f76e08
--- /dev/null
+++ b/src/gallium/drivers/nvfx/Makefile.sources
@@ -0,0 +1,22 @@
+C_SOURCES := \
+	nv04_2d.c \
+	nvfx_buffer.c \
+	nvfx_context.c \
+	nvfx_clear.c \
+	nvfx_draw.c \
+	nvfx_fragprog.c \
+	nvfx_fragtex.c \
+	nv30_fragtex.c \
+	nv40_fragtex.c \
+	nvfx_miptree.c \
+	nvfx_push.c \
+	nvfx_query.c \
+	nvfx_resource.c \
+	nvfx_screen.c \
+	nvfx_state.c \
+	nvfx_state_emit.c \
+	nvfx_state_fb.c \
+	nvfx_surface.c \
+	nvfx_transfer.c \
+	nvfx_vbo.c \
+	nvfx_vertprog.c
diff --git a/src/gallium/drivers/nvfx/SConscript b/src/gallium/drivers/nvfx/SConscript
index f1041e77633..4f57662d5e1 100644
--- a/src/gallium/drivers/nvfx/SConscript
+++ b/src/gallium/drivers/nvfx/SConscript
@@ -8,28 +8,7 @@ env.PrependUnique(delete_existing=1, CPPPATH = [
 
 nvfx = env.ConvenienceLibrary(
     target = 'nvfx',
-    source = [
-        'nv04_2d.c',
-        'nvfx_buffer.c',
-        'nvfx_context.c',
-        'nvfx_clear.c',
-        'nvfx_draw.c',
-        'nvfx_fragprog.c',
-        'nvfx_fragtex.c',
-        'nv30_fragtex.c',
-        'nv40_fragtex.c',
-        'nvfx_miptree.c',
-        'nvfx_push.c',
-        'nvfx_query.c',
-        'nvfx_resource.c',
-        'nvfx_screen.c',
-        'nvfx_state.c',
-        'nvfx_state_emit.c',
-        'nvfx_state_fb.c',
-        'nvfx_surface.c',
-        'nvfx_transfer.c',
-        'nvfx_vbo.c',
-        'nvfx_vertprog.c',
-    ])
+    source = env.ParserSourceList('Makefile.sources', 'C_SOURCES')
+    )
 
 Export('nvfx')