From edd11ece383416bf9a1c6ced36214f7fd240a274 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 6 Jun 2013 00:02:35 +0100 Subject: [PATCH] st/dri/sw: consolidate C sources list into Makefile.sources Signed-off-by: Emil Velikov Reviewed-by: Tom Stellard --- src/gallium/state_trackers/dri/sw/Makefile.am | 7 ++----- src/gallium/state_trackers/dri/sw/Makefile.sources | 5 +++++ src/gallium/state_trackers/dri/sw/SConscript | 9 +-------- 3 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 src/gallium/state_trackers/dri/sw/Makefile.sources diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am index b62161a4c1a..f0377a8ede3 100644 --- a/src/gallium/state_trackers/dri/sw/Makefile.am +++ b/src/gallium/state_trackers/dri/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_CPPFLAGS = \ @@ -34,8 +35,4 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libdrisw.la -libdrisw_la_SOURCES = \ - dri_context.c \ - dri_screen.c \ - dri_drawable.c \ - drisw.c +libdrisw_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/state_trackers/dri/sw/Makefile.sources b/src/gallium/state_trackers/dri/sw/Makefile.sources new file mode 100644 index 00000000000..1255934cabc --- /dev/null +++ b/src/gallium/state_trackers/dri/sw/Makefile.sources @@ -0,0 +1,5 @@ +C_SOURCES := \ + dri_context.c \ + dri_screen.c \ + dri_drawable.c \ + drisw.c diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript index 287733eea62..6d482a5bc94 100644 --- a/src/gallium/state_trackers/dri/sw/SConscript +++ b/src/gallium/state_trackers/dri/sw/SConscript @@ -15,15 +15,8 @@ env.Append(CPPPATH = [ env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')]) -sources = [ - 'dri_context.c', - 'dri_drawable.c', - 'dri_screen.c', - 'drisw.c', -] - st_drisw = env.ConvenienceLibrary( target = 'st_drisw', - source = sources, + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') ) Export('st_drisw') -- 2.30.2