From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 26 Aug 2010 05:40:49 +0000 (+0100)
Subject: scons: Fix old script compatability logic.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c32f87c39ce2b2e0ac6ae93d3bd5f286bf345613;p=mesa.git

scons: Fix old script compatability logic.

Sconscript could be invoked twice if specified in the command line.
---

diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index f8276b15558..e447d093610 100644
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -1,18 +1,13 @@
 import os
 Import('*')
-	
+
 # Compatibility with old build scripts:
 #
 if 'mesa' in env['statetrackers']:
-	if 'xlib' in env['winsys']:
-		SConscript([
-			'libgl-xlib/SConscript',
-		])
-
-	if 'gdi' in env['winsys']:
-		SConscript([
-			'libgl-gdi/SConscript',
-		])
+    if 'xlib' in env['winsys'] and 'libgl-xlib' not in env['targets']:
+        env['targets'].append('libgl-xlib')
+    if 'gdi' in env['winsys'] and 'libgl-gdi' not in env['targets']:
+        env['targets'].append('libgl-gdi')
 
 if not 'graw-xlib' in env['targets'] and not 'graw-null' in env['targets'] and not env['msvc']:
         # XXX: disable until MSVC can link correctly