[Mesa-dev] [PATCH 14/29] st/dri: consolidate C sources list into Makefile.sources

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/state_trackers/dri/drm/Makefile.am      | 7 ++-----
 src/gallium/state_trackers/dri/drm/Makefile.sources | 5 +++++
 src/gallium/state_trackers/dri/drm/SConscript       | 9 +--------
 3 files changed, 8 insertions(+), 13 deletions(-)
 create mode 100644 src/gallium/state_trackers/dri/drm/Makefile.sources

diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
index f8916b1..c90c463 100644
--- a/src/gallium/state_trackers/dri/drm/Makefile.am
+++ b/src/gallium/state_trackers/dri/drm/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_CPPFLAGS = \
@@ -34,8 +35,4 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libdridrm.la
 
-libdridrm_la_SOURCES = \
-	dri_context.c \
-	dri_screen.c \
-	dri_drawable.c \
-	dri2.c
+libdridrm_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/state_trackers/dri/drm/Makefile.sources b/src/gallium/state_trackers/dri/drm/Makefile.sources
new file mode 100644
index 0000000..b9b93a2
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/Makefile.sources
@@ -0,0 +1,5 @@
+C_SOURCES := \
+	dri_context.c \
+	dri_screen.c \
+	dri_drawable.c \
+	dri2.c
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index a996f50..07eaa0a 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -15,15 +15,8 @@ env.Append(CPPPATH = [
     xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
 ])
 
-sources = [
-    'dri_context.c',
-    'dri_drawable.c',
-    'dri_screen.c',
-    'dri2.c',
-]
-
 st_dri = env.ConvenienceLibrary(
     target = 'st_dri',
-    source = sources,
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 )
 Export('st_dri')
-- 
1.8.4