diff --git a/src/mesa/drivers/dri/fb/Makefile.X11 b/src/mesa/drivers/dri/fb/Makefile.solo
similarity index 91%
rename from src/mesa/drivers/dri/fb/Makefile.X11
rename to src/mesa/drivers/dri/fb/Makefile.solo
index c1eb713bda9..3de98fdc84c 100644
--- a/src/mesa/drivers/dri/fb/Makefile.X11
+++ b/src/mesa/drivers/dri/fb/Makefile.solo
@@ -51,7 +51,7 @@ INCLUDE_DIRS = \
 
 targets: depend fb_dri.so
 
-fb_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+fb_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc -lm
 	rm -f $(TOP)/lib/fb_dri.so && \
 	install fb_dri.so $(TOP)/lib/fb_dri.so
@@ -60,7 +60,7 @@ $(TOP)/lib/fb_dri.so:	fb_dri.so
 	rm -f $(TOP)/lib/fb_dri.so && \
 	install fb_dri.so $(TOP)/lib/fb_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) \
diff --git a/src/mesa/drivers/dri/ffb/Makefile.X11 b/src/mesa/drivers/dri/ffb/Makefile.solo
similarity index 96%
rename from src/mesa/drivers/dri/ffb/Makefile.X11
rename to src/mesa/drivers/dri/ffb/Makefile.solo
index 3e87f9bbcc7..4333e0685f8 100644
--- a/src/mesa/drivers/dri/ffb/Makefile.X11
+++ b/src/mesa/drivers/dri/ffb/Makefile.solo
@@ -98,7 +98,7 @@ INCLUDE_DIRS = \
 
 targets: depend ffb_dri.so
 
-ffb_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+ffb_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/ffb_dri.so && \
 	install ffb_dri.so $(TOP)/lib/ffb_dri.so
@@ -107,7 +107,7 @@ $(TOP)/lib/ffb_dri.so:	ffb_dri.so
 	rm -f $(TOP)/lib/ffb_dri.so && \
 	install ffb_dri.so $(TOP)/lib/ffb_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/gamma/Makefile.X11 b/src/mesa/drivers/dri/gamma/Makefile.solo
similarity index 92%
rename from src/mesa/drivers/dri/gamma/Makefile.X11
rename to src/mesa/drivers/dri/gamma/Makefile.solo
index 8364ebaecf0..04b7b265644 100644
--- a/src/mesa/drivers/dri/gamma/Makefile.X11
+++ b/src/mesa/drivers/dri/gamma/Makefile.solo
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.3 2003/11/24 15:21:14 keithw Exp $
+# $Id: Makefile.solo,v 1.1 2003/12/12 15:30:52 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -92,7 +92,7 @@ INCLUDE_DIRS = \
 
 targets: depend gamma_dri.so
 
-gamma_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+gamma_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/gamma_dri.so && \
 	install gamma_dri.so $(TOP)/lib/gamma_dri.so
@@ -101,7 +101,7 @@ $(TOP)/lib/gamma_dri.so:	gamma_dri.so
 	rm -f $(TOP)/lib/gamma_dri.so && \
 	install gamma_dri.so $(TOP)/lib/gamma_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/i810/Makefile.X11 b/src/mesa/drivers/dri/i810/Makefile.solo
similarity index 94%
rename from src/mesa/drivers/dri/i810/Makefile.X11
rename to src/mesa/drivers/dri/i810/Makefile.solo
index 8f9c7958ba2..19fca1864ce 100644
--- a/src/mesa/drivers/dri/i810/Makefile.X11
+++ b/src/mesa/drivers/dri/i810/Makefile.solo
@@ -88,7 +88,7 @@ INCLUDE_DIRS = \
 
 targets: depend i810_dri.so
 
-i810_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+i810_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/i810_dri.so && \
 	install i810_dri.so $(TOP)/lib/i810_dri.so
@@ -97,7 +97,7 @@ $(TOP)/lib/i810_dri.so:	i810_dri.so
 	rm -f $(TOP)/lib/i810_dri.so && \
 	install i810_dri.so $(TOP)/lib/i810_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/i830/Makefile.X11 b/src/mesa/drivers/dri/i830/Makefile.solo
similarity index 94%
rename from src/mesa/drivers/dri/i830/Makefile.X11
rename to src/mesa/drivers/dri/i830/Makefile.solo
index cfc513690db..5bef9d0f1fb 100644
--- a/src/mesa/drivers/dri/i830/Makefile.X11
+++ b/src/mesa/drivers/dri/i830/Makefile.solo
@@ -89,7 +89,7 @@ INCLUDE_DIRS = \
 
 targets: depend i830_dri.so
 
-i830_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+i830_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/i830_dri.so && \
 	install i830_dri.so $(TOP)/lib/i830_dri.so
@@ -98,7 +98,7 @@ $(TOP)/lib/i830_dri.so:	i830_dri.so
 	rm -f $(TOP)/lib/i830_dri.so && \
 	install i830_dri.so $(TOP)/lib/i830_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/mga/Makefile.X11 b/src/mesa/drivers/dri/mga/Makefile.solo
similarity index 94%
rename from src/mesa/drivers/dri/mga/Makefile.X11
rename to src/mesa/drivers/dri/mga/Makefile.solo
index 246a7451840..3c6afbc3246 100644
--- a/src/mesa/drivers/dri/mga/Makefile.X11
+++ b/src/mesa/drivers/dri/mga/Makefile.solo
@@ -95,7 +95,7 @@ INCLUDE_DIRS = \
 
 targets: depend mga_dri.so
 
-mga_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+mga_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc -lm
 	rm -f $(TOP)/lib/mga_dri.so && \
 	install mga_dri.so $(TOP)/lib/mga_dri.so
@@ -104,7 +104,7 @@ $(TOP)/lib/mga_dri.so:	mga_dri.so
 	rm -f $(TOP)/lib/mga_dri.so && \
 	install mga_dri.so $(TOP)/lib/mga_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/r128/Makefile.X11 b/src/mesa/drivers/dri/r128/Makefile.solo
similarity index 94%
rename from src/mesa/drivers/dri/r128/Makefile.X11
rename to src/mesa/drivers/dri/r128/Makefile.solo
index c77b0e44459..39b14c90262 100644
--- a/src/mesa/drivers/dri/r128/Makefile.X11
+++ b/src/mesa/drivers/dri/r128/Makefile.solo
@@ -89,7 +89,7 @@ INCLUDE_DIRS = \
 
 targets: depend r128_dri.so
 
-r128_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+r128_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/r128_dri.so && \
 	install r128_dri.so $(TOP)/lib/r128_dri.so
@@ -98,7 +98,7 @@ $(TOP)/lib/r128_dri.so: r128_dri.so
 	rm -f $(TOP)/lib/r128_dri.so && \
 	install r128_dri.so $(TOP)/lib/r128_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/r200/Makefile.X11 b/src/mesa/drivers/dri/r200/Makefile.solo
similarity index 96%
rename from src/mesa/drivers/dri/r200/Makefile.X11
rename to src/mesa/drivers/dri/r200/Makefile.solo
index bfa332af25e..e3fe696709b 100644
--- a/src/mesa/drivers/dri/r200/Makefile.X11
+++ b/src/mesa/drivers/dri/r200/Makefile.solo
@@ -113,7 +113,7 @@ INCLUDE_DIRS = \
 
 targets: depend r200_dri.so
 
-r200_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+r200_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/r200_dri.so && \
 	install r200_dri.so $(TOP)/lib/r200_dri.so
@@ -122,7 +122,7 @@ $(TOP)/lib/r200_dri.so:	r200_dri.so
 	rm -f $(TOP)/lib/r200_dri.so && \
 	install r200_dri.so $(TOP)/lib/r200_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/radeon/Makefile.X11 b/src/mesa/drivers/dri/radeon/Makefile.solo
similarity index 95%
rename from src/mesa/drivers/dri/radeon/Makefile.X11
rename to src/mesa/drivers/dri/radeon/Makefile.solo
index fd379e9a0d6..8ff68c76905 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.X11
+++ b/src/mesa/drivers/dri/radeon/Makefile.solo
@@ -127,7 +127,7 @@ INCLUDE_DIRS = \
 
 targets: depend $(TARGET)
 
-$(TARGET):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+$(TARGET):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc -lm
 	rm -f $(TOP)/lib/$(TARGET) && \
 	install $(TARGET) $(TOP)/lib/$(TARGET)
@@ -136,7 +136,7 @@ $(TOP)/lib/$(TARGET):	$(TARGET)
 	rm -f $(TOP)/lib/$(TARGET) && \
 	install $(TARGET) $(TOP)/lib/$(TARGET)
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES)\
diff --git a/src/mesa/drivers/dri/sis/Makefile.X11 b/src/mesa/drivers/dri/sis/Makefile.solo
similarity index 94%
rename from src/mesa/drivers/dri/sis/Makefile.X11
rename to src/mesa/drivers/dri/sis/Makefile.solo
index 0891edb69a8..655c4e7d31c 100644
--- a/src/mesa/drivers/dri/sis/Makefile.X11
+++ b/src/mesa/drivers/dri/sis/Makefile.solo
@@ -91,7 +91,7 @@ INCLUDE_DIRS = \
 
 targets: depend sis_dri.so
 
-sis_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+sis_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/sis_dri.so && \
 	install sis_dri.so $(TOP)/lib/sis_dri.so
@@ -100,7 +100,7 @@ $(TOP)/lib/sis_dri.so:	sis_dri.so
 	rm -f $(TOP)/lib/sis_dri.so && \
 	install sis_dri.so $(TOP)/lib/sis_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
diff --git a/src/mesa/drivers/dri/tdfx/Makefile.X11 b/src/mesa/drivers/dri/tdfx/Makefile.solo
similarity index 96%
rename from src/mesa/drivers/dri/tdfx/Makefile.X11
rename to src/mesa/drivers/dri/tdfx/Makefile.solo
index b05717f1004..99a1b88209f 100644
--- a/src/mesa/drivers/dri/tdfx/Makefile.X11
+++ b/src/mesa/drivers/dri/tdfx/Makefile.solo
@@ -96,7 +96,7 @@ INCLUDE_DIRS = \
 
 targets: depend tdfx_dri.so
 
-tdfx_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
+tdfx_dri.so:  $(SYMLINKS) $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
 	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
 	rm -f $(TOP)/lib/tdfx_dri.so && \
 	install tdfx_dri.so $(TOP)/lib/tdfx_dri.so
@@ -105,7 +105,7 @@ $(TOP)/lib/tdfx_dri.so:	tdfx_dri.so
 	rm -f $(TOP)/lib/tdfx_dri.so && \
 	install tdfx_dri.so $(TOP)/lib/tdfx_dri.so
 
-# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
+# Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \