From 37f0654fa56a97c6f4ea6220c97758ee95267e0b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sun, 22 Aug 2010 17:28:20 +1000
Subject: [PATCH] r300g: rename radeong_dri.so to r300_dri.so

acked on irc by Corbin + Marek.
---
 configure.ac                                             | 2 +-
 src/gallium/targets/{dri-radeong => dri-r300}/Makefile   | 2 +-
 src/gallium/targets/{dri-radeong => dri-r300}/SConscript | 4 ++--
 src/gallium/targets/{dri-radeong => dri-r300}/target.c   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/gallium/targets/{dri-radeong => dri-r300}/Makefile (96%)
 rename src/gallium/targets/{dri-radeong => dri-r300}/SConscript (81%)
 rename src/gallium/targets/{dri-radeong => dri-r300}/target.c (89%)

diff --git a/configure.ac b/configure.ac
index b2c6b52..0b60837 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1488,7 +1488,7 @@ AC_ARG_ENABLE([gallium-radeon],
     [enable_gallium_radeon=auto])
 if test "x$enable_gallium_radeon" = xyes; then
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-    gallium_check_st "radeon/drm" "dri-radeong" "xorg-radeon"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
 elif test "x$enable_gallium_radeon" = xauto; then
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
 fi
diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-r300/Makefile
similarity index 96%
rename from src/gallium/targets/dri-radeong/Makefile
rename to src/gallium/targets/dri-r300/Makefile
index 3f9ec36..9afbb13 100644
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-r300/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-LIBNAME = radeong_dri.so
+LIBNAME = r300_dri.so
 
 PIPE_DRIVERS = \
 	$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-r300/SConscript
similarity index 81%
rename from src/gallium/targets/dri-radeong/SConscript
rename to src/gallium/targets/dri-r300/SConscript
index 1402c3b..33a458f 100644
--- a/src/gallium/targets/dri-radeong/SConscript
+++ b/src/gallium/targets/dri-r300/SConscript
@@ -1,7 +1,7 @@
 Import('*')
 
 if not 'r300' in env['drivers']:
-    print 'warning: r300 pipe driver not built skipping radeong_dri.so'
+    print 'warning: r300 pipe driver not built skipping r300_dri.so'
     Return()
 
 env = drienv.Clone()
@@ -24,7 +24,7 @@ env.Prepend(LIBS = [
 ])
 
 env.SharedLibrary(
-    target ='radeon_dri.so',
+    target ='r300_dri.so',
     source = 'target.c',
     SHLIBPREFIX = '',
 )
diff --git a/src/gallium/targets/dri-radeong/target.c b/src/gallium/targets/dri-r300/target.c
similarity index 89%
rename from src/gallium/targets/dri-radeong/target.c
rename to src/gallium/targets/dri-r300/target.c
index 5a0a8dc..2ecf345 100644
--- a/src/gallium/targets/dri-radeong/target.c
+++ b/src/gallium/targets/dri-r300/target.c
@@ -23,4 +23,4 @@ create_screen(int fd)
    return screen;
 }
 
-DRM_DRIVER_DESCRIPTOR("radeon", "radeon", create_screen)
+DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen)
-- 
2.7.4