3 files changed, 6 insertions, 115 deletions

diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 2037d59101..e6f7c29d1a 100644
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -4,30 +4,7 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
-ifeq ($(EMBEDDED),true)
-LIBNAME = radeon_es_dri.so
-DEFINES += \
-	-D_EMBEDDED \
-	-D_HAVE_SWRAST=0 \
-	-D_HAVE_SWTNL=0 \
-	-D_HAVE_SANITY=0 \
-	-D_HAVE_CODEGEN=0 \
-	-D_HAVE_LIGHTING=0 \
-	-D_HAVE_TEXGEN=0 \
-	-D_HAVE_USERCLIP=0 \
-	-DGLX_DIRECT_RENDERING
-else
 LIBNAME = radeon_dri.so
-DEFINES += \
-	-D_HAVE_SWRAST=1 \
-	-D_HAVE_SWTNL=1 \
-	-D_HAVE_SANITY=1 \
-	-D_HAVE_CODEGEN=1 \
-	-D_HAVE_LIGHTING=1 \
-	-D_HAVE_TEXGEN=1 \
-	-D_HAVE_USERCLIP=1 \
-	-DGLX_DIRECT_RENDERING
-endif
 
 MINIGLX_SOURCES = server/radeon_dri.c 
 
@@ -45,16 +22,7 @@ DRIVER_SOURCES = \
 	radeon_lock.c \
 	radeon_screen.c \
 	radeon_state.c \
-	radeon_state_init.c
-
-SUBSET_DRIVER_SOURCES = \
-	radeon_subset_bitmap.c \
-	radeon_subset_readpix.c \
-	radeon_subset_select.c \
-	radeon_subset_tex.c \
-	radeon_subset_vtx.c 
-
-FULL_DRIVER_SOURCES = \
+	radeon_state_init.c \
 	radeon_tex.c \
 	radeon_texmem.c \
 	radeon_texstate.c \
@@ -69,91 +37,14 @@ FULL_DRIVER_SOURCES = \
 	radeon_vtxfmt_sse.c \
 	radeon_vtxfmt_x86.c 
 
-ifeq ($(EMBEDDED),true)
-C_SOURCES = \
-	$(COMMON_SOURCES) \
-	$(MINIGLX_SOURCES) \
-	$(DRIVER_SOURCES) \
-	$(SUBSET_DRIVER_SOURCES)
-else
 C_SOURCES = \
 	$(COMMON_SOURCES) \
-	$(MINIGLX_SOURCES) \
-	$(DRIVER_SOURCES) \
-	$(FULL_DRIVER_SOURCES)
-endif
-
-
-# Include directories
-INCLUDE_DIRS = \
-	-I. \
-	-I../common \
-	-Iserver \
-	-I$(TOP)/src/glx/mini \
-	-I$(TOP)/include \
-	-I$(DRM_SOURCE_PATH)/shared \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main \
-	-I$(TOP)/src/mesa/glapi \
-	-I$(TOP)/src/mesa/math \
-	-I$(TOP)/src/mesa/transform \
-	-I$(TOP)/src/mesa/shader \
-	-I$(TOP)/src/mesa/swrast \
-	-I$(TOP)/src/mesa/swrast_setup
+	$(DRIVER_SOURCES) 
 
-# Core Mesa objects
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-# Libraries that the driver shared lib depends on
-LIB_DEPS = $(GL_LIB_DEPS)
-
-
-ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=$(MESABUILDDIR)/dri/dri.a
-WINLIB=
-else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
-endif
 
 ASM_SOURCES = 
 
-OBJECTS = $(C_SOURCES:.c=.o) \
-	  $(ASM_SOURCES:.S=.o) 
-
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(LIB_DIR)/$(LIBNAME)
-
-
-$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-	$(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
-		$(WINLIB) $(LIB_DEPS) $(WINOBJ) $(OBJECTS) $(MESA_MODULES)
-
-
-depend: $(C_SOURCES) $(ASM_SOURCES)
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-		>& /dev/null
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-clean:
-	-rm -f *.o server/*.o
 
+include ../Makefile.template
 
-include depend
+symlinks:
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 14ea13648c..f080d47446 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -49,7 +49,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vblank.h"
 
 #ifndef _SOLO
-#include "glxextensions.h"
+#include "GL/internal/dri_interface.h"
 #endif
 
 /* Radeon configuration
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index 5c80281777..d501fa1f23 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -43,7 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * IMPORTS: these headers contain all the DRI, X and kernel-related
  * definitions that we need.
  */
-#include "dri_util.h"
+/* #include "dri_util.h" */
 #include "radeon_dri.h"
 #include "radeon_reg.h"
 #include "drm_sarea.h"