Merge branch '7.8'

[mesa.git] / src / gallium / state_trackers / dri / SConscript

diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index 2ca9f4206839991c3875e5ffb52ea9cf585b8072..aba60fb8c5bb324044ce652f2dd2691d1b4d7f19 100644 (file)
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -1,27 +1,6 @@
-#######################################################################
-# SConscript for dri state_tracker
-
 Import('*')
 
-if env['dri']:
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-        '#/src/mesa',
-       '#/src/mesa/drivers/dri/common',
-    ])
-
-    st_dri = env.ConvenienceLibrary(
-       target = 'st_dri',
-       source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_extensions.c',
-               'dri_screen.c',
-               'dri_st_api.c',
-               'dri1_helper.c',
-               'dri1.c',
-               'dri2.c',
-               ]
-    )
-    Export('st_dri')
+SConscript([
+       'sw/SConscript',
+       'drm/SConscript',
+])