winsys/i915/sw: 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/winsys/i915/sw/Makefile.am b/src/gallium/winsys/i915/sw/Makefile.am
index 2276f0d8c65bc8963454c5223f5db37fc2b084cd..186fee3963c1e96cb92755a715a5055462165405 100644 (file)
--- a/src/gallium/winsys/i915/sw/Makefile.am
+++ b/src/gallium/winsys/i915/sw/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
 
 AM_CFLAGS = \
@@ -30,8 +31,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libi915sw.la
 
-libi915sw_la_SOURCES = \
-       i915_sw_batchbuffer.c \
-       i915_sw_buffer.c \
-       i915_sw_fence.c \
-       i915_sw_winsys.c
+libi915sw_la_SOURCES = $(C_SOURCES)

diff --git a/src/gallium/winsys/i915/sw/Makefile.sources b/src/gallium/winsys/i915/sw/Makefile.sources
new file mode 100644 (file)
index 0000000..89a38c6
--- /dev/null
+++ b/src/gallium/winsys/i915/sw/Makefile.sources
@@ -0,0 +1,5 @@
+C_SOURCES := \
+       i915_sw_batchbuffer.c \
+       i915_sw_buffer.c \
+       i915_sw_fence.c \
+       i915_sw_winsys.c

diff --git a/src/gallium/winsys/i915/sw/SConscript b/src/gallium/winsys/i915/sw/SConscript
index 84f427a128a1e6a6daa0d4eaff07390dcfdfed44..9d785191d54c43c139fd371da12a541fe17e476c 100644 (file)
--- a/src/gallium/winsys/i915/sw/SConscript
+++ b/src/gallium/winsys/i915/sw/SConscript
@@ -2,12 +2,7 @@ Import('*')
 
 env = env.Clone()
 
-i915_sw_sources = [
-    'i915_sw_batchbuffer.c',
-    'i915_sw_buffer.c',
-    'i915_sw_winsys.c',
-    'i915_sw_fence.c',
-]
+i915_sw_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 
 i915sw = env.ConvenienceLibrary(
     target ='i915sw',