Merge branch 'lp-offset-twoside'

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

diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 1dfaa402f2d7d2775f6cccad3877808d7023cae5..b188f76f910a85df0ab85a2fea003a1500e27c98 100644 (file)
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -3,27 +3,26 @@
 
 Import('*')
 
-if env['dri']:
+env = env.Clone()
 
-    env = env.Clone()
+env.ParseConfig('pkg-config --cflags --libs libdrm')
 
-    env.ParseConfig('pkg-config --cflags --libs libdrm')
+env.Append(CPPPATH = [
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/src/gallium/state_trackers/dri/common',
+    '#/src/mesa/drivers/dri/common',
+])
 
-    env.Append(CPPPATH = [
-        '#/src/mesa',
-       '#/src/gallium/state_trackers/dri/common',
-       '#/src/mesa/drivers/dri/common',
-    ])
+sources = [
+    'dri_context.c',
+    'dri_drawable.c',
+    'dri_screen.c',
+    'dri2.c',
+]
 
-    st_dri = env.ConvenienceLibrary(
-       target = 'st_dri',
-       source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_screen.c',
-               'dri_st_api.c',
-               'dri1_helper.c',
-               'dri1.c',
-               'dri2.c',
-               ]
-    )
-    Export('st_dri')
+st_dri = env.ConvenienceLibrary(
+    target = 'st_dri',
+    source = sources,
+)
+Export('st_dri')