Mesa (master): r300g: Fix SCons build.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 3d0009ce457c78390ba1ffa0e8a991d65a99c448
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d0009ce457c78390ba1ffa0e8a991d65a99c448

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Mon Jul 20 02:06:37 2009 +0200

r300g: Fix SCons build.

---

 src/gallium/winsys/drm/radeon/SConscript      |    2 +-
 src/gallium/winsys/drm/radeon/core/SConscript |    4 +++-
 src/gallium/winsys/drm/radeon/dri/SConscript  |    5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript
index 8f99055..b2dfd50 100644
--- a/src/gallium/winsys/drm/radeon/SConscript
+++ b/src/gallium/winsys/drm/radeon/SConscript
@@ -4,4 +4,4 @@ SConscript(['core/SConscript',])
 
 if 'mesa' in env['statetrackers']:
 
-    SConscript(['dri2/SConscript'])
+    SConscript(['dri/SConscript'])
diff --git a/src/gallium/winsys/drm/radeon/core/SConscript b/src/gallium/winsys/drm/radeon/core/SConscript
index 578174e..2ad68e4 100644
--- a/src/gallium/winsys/drm/radeon/core/SConscript
+++ b/src/gallium/winsys/drm/radeon/core/SConscript
@@ -11,7 +11,9 @@ radeon_sources = [
 
 env.Append(CPPPATH = '#/src/gallium/drivers/r300')
 
-env.ConvenienceLibrary(
+radeonwinsys = env.ConvenienceLibrary(
     target ='radeonwinsys',
     source = radeon_sources,
 )
+
+Export('radeonwinsys')
diff --git a/src/gallium/winsys/drm/radeon/dri/SConscript b/src/gallium/winsys/drm/radeon/dri/SConscript
index f2cdee9..aea987a 100644
--- a/src/gallium/winsys/drm/radeon/dri/SConscript
+++ b/src/gallium/winsys/drm/radeon/dri/SConscript
@@ -2,7 +2,10 @@ Import('*')
 
 env = drienv.Clone()
 
+env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
+
 drivers = [
+    trace,
     softpipe,
     r300
 ]
@@ -10,5 +13,5 @@ drivers = [
 env.SharedLibrary(
     target ='radeon_dri.so',
     source = COMMON_GALLIUM_SOURCES,
-    LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+    LIBS = st_dri + radeonwinsys + mesa + drivers + auxiliaries + env['LIBS'],
 )