gallium: Fix DRI driver build warnings under scons

When building more then one dri driver we would get warnings because
we where defining the same build target multiple times.

Also move all the dri scons targets related code into its own file.

1 files changed, 2 insertions, 64 deletions

diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index a41496a5dd9..747e64508f7 100644
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -1,9 +1,4 @@
 Import('*')
-
-#if env['dri']:
-#	SConscript([
-#		'drm/SConscript',
-#	])
 	
 if 'xlib' in env['winsys']:
 	SConscript([
@@ -16,67 +11,10 @@ if 'gdi' in env['winsys']:
 	])
 
 if env['dri']:
-	drienv = env.Clone()
-
-	drienv.Replace(CPPPATH = [
-		'#src/mesa/drivers/dri/common',
-		'#include',
-		'#include/GL/internal',
-		'#src/gallium/include',
-		'#src/gallium/auxiliary',
-		'#src/gallium/drivers',
-		'#src/mesa',
-		'#src/mesa/main',
-		'#src/mesa/glapi',
-		'#src/mesa/math',
-		'#src/mesa/transform',
-		'#src/mesa/shader',
-		'#src/mesa/swrast',
-		'#src/mesa/swrast_setup',
-		'#src/egl/main',
-		'#src/egl/drivers/dri',
-	])
-
-	drienv.ParseConfig('pkg-config --cflags --libs libdrm')
-
-	COMMON_GALLIUM_SOURCES = [
-		'#src/mesa/drivers/dri/common/utils.c',
-		'#src/mesa/drivers/dri/common/vblank.c',
-		'#src/mesa/drivers/dri/common/dri_util.c',
-		'#src/mesa/drivers/dri/common/xmlconfig.c',
-	]
-
-	COMMON_BM_SOURCES = [
-		'#src/mesa/drivers/dri/common/dri_bufmgr.c',
-		'#src/mesa/drivers/dri/common/dri_drmpool.c',
-	]
-
-	Export([
-		'drienv',
-		'COMMON_GALLIUM_SOURCES',
-		'COMMON_BM_SOURCES',
+	SConscript([
+		'SConscript.dri'
 	])
 
-	if 'vmware' in env['winsys']:
-		SConscript([
-			'dri-vmwgfx/SConscript',
-		])
-
-	if 'i915' in env['winsys']:
-		SConscript([
-			'dri-i915/SConscript',
-		])
-
-	if 'i965' in env['winsys']:
-		SConscript([
-			'dri-i965/SConscript',
-		])
-
-	if 'radeon' in env['winsys']:
-		SConscript([
-			'dri-radeong/SConscript',
-		])
-
 if 'xorg' in env['statetrackers']:
 	if 'vmware' in env['winsys']:
 		SConscript([