summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-06-06 00:02:35 +0100
committerTom Stellard <thomas.stellard@amd.com>2013-10-01 07:29:51 -0700
commitedd11ece383416bf9a1c6ced36214f7fd240a274 (patch)
treeacb8212096806cd92d74b6b86440a8e8577f03cd /src/gallium/state_trackers/dri
parentf9ddeac213a0b430d017de8795bca86a2987c7c3 (diff)
downloadexternal_mesa3d-edd11ece383416bf9a1c6ced36214f7fd240a274.zip
external_mesa3d-edd11ece383416bf9a1c6ced36214f7fd240a274.tar.gz
external_mesa3d-edd11ece383416bf9a1c6ced36214f7fd240a274.tar.bz2
st/dri/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>
Diffstat (limited to 'src/gallium/state_trackers/dri')
-rw-r--r--src/gallium/state_trackers/dri/sw/Makefile.am7
-rw-r--r--src/gallium/state_trackers/dri/sw/Makefile.sources5
-rw-r--r--src/gallium/state_trackers/dri/sw/SConscript9
3 files changed, 8 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am
index b62161a..f0377a8 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 0000000..1255934
--- /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 287733e..6d482a5 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')