3 files changed, 12 insertions, 19 deletions
diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript
index 8d98b36fba..352efe95d0 100644
--- a/src/gallium/targets/graw-gdi/SConscript
+++ b/src/gallium/targets/graw-gdi/SConscript
@@ -9,15 +9,9 @@ env.Append(CPPPATH = [
     '#src/gallium/winsys/sw',
 ])
 
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
-
 env.Prepend(LIBS = [
     gallium,
     'gdi32',
-    identity,
-    rbug,
-    trace,
-    galahad,
     'user32',
     'ws2_32',
 ])
@@ -27,8 +21,13 @@ sources = [
     graw_util,
 ]
 
-env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-env.Prepend(LIBS = [softpipe])
+if True:
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
+
+if env['llvm']:
+    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+    env.Prepend(LIBS = [llvmpipe])
 
 graw = env.SharedLibrary(
     target = 'graw',
diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index 6d32ea537d..42cb349cc9 100644
--- a/src/gallium/targets/graw-xlib/SConscript
+++ b/src/gallium/targets/graw-xlib/SConscript
@@ -7,9 +7,6 @@ env = env.Clone()
 
 env.Prepend(LIBS = [
     ws_xlib,
-    trace,
-    rbug,
-    galahad,
     gallium,
 ])
 
@@ -28,8 +25,8 @@ sources = [
 ]
 
 if True:
-    env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-    env.Prepend(LIBS = [softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
 
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 6582a2f27b..d932736be7 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -19,9 +19,6 @@ env.Prepend(LIBS = env['X11_LIBS'])
 env.Prepend(LIBS = [
     st_xlib,
     ws_xlib,
-    trace,
-    rbug,
-    galahad,
     glapi,
     mesa,
     glsl,
@@ -34,11 +31,11 @@ sources = [
 ]
 
 if True:
-    env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-    env.Prepend(LIBS = [softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
 
 if env['llvm']:
-    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+    env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
     env.Prepend(LIBS = [llvmpipe])
     
 if False: