obsolete in favor of regular Makefiles
authorBrian Paul <brian.paul@tungstengraphics.com>
Wed, 12 May 2004 14:04:29 +0000 (14:04 +0000)
committerBrian Paul <brian.paul@tungstengraphics.com>
Wed, 12 May 2004 14:04:29 +0000 (14:04 +0000)
17 files changed:
progs/miniglx/Makefile.solo [deleted file]
src/glut/mini/Makefile.solo [deleted file]
src/glx/mini/Makefile.solo [deleted file]
src/mesa/Makefile.solo [deleted file]
src/mesa/drivers/dri/fb/Makefile.solo [deleted file]
src/mesa/drivers/dri/ffb/Makefile.solo [deleted file]
src/mesa/drivers/dri/gamma/Makefile.solo [deleted file]
src/mesa/drivers/dri/i810/Makefile.solo [deleted file]
src/mesa/drivers/dri/i830/Makefile.solo [deleted file]
src/mesa/drivers/dri/mach64/Makefile.solo [deleted file]
src/mesa/drivers/dri/mga/Makefile.solo [deleted file]
src/mesa/drivers/dri/r128/Makefile.solo [deleted file]
src/mesa/drivers/dri/r200/Makefile.solo [deleted file]
src/mesa/drivers/dri/radeon/Makefile.solo [deleted file]
src/mesa/drivers/dri/sis/Makefile.solo [deleted file]
src/mesa/drivers/dri/tdfx/Makefile.solo [deleted file]
src/mesa/drivers/dri/unichrome/Makefile.solo [deleted file]

diff --git a/progs/miniglx/Makefile.solo b/progs/miniglx/Makefile.solo
deleted file mode 100644 (file)
index 0cca1e0..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# Makefile for miniglx demo programs
-
-TOP = ../..
-
-default: linux-solo
-
-LIBS = $(APP_LIB_DEPS)
-
-SOURCES = miniglxtest.c \
-miniglxsample.c \
-sample_server.c \
-sample_server2.c \
-manytex.c \
-texline.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(SOURCES:%.c=%)
-
-INCLUDES = \
-       -I. \
-       -I$(TOP)/include
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c:
-       $(CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets:  depend $(PROGS)
-
-clean:
-       rm -f $(PROGS)
-       rm -f *.o
-
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES)
-       makedepend -fdepend -Y $(INCLUDES) \
-               $(SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/glut/mini/Makefile.solo b/src/glut/mini/Makefile.solo
deleted file mode 100644 (file)
index f413ed1..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-
-TOP = ../../..
-
-default: linux-solo
-
-MARK = $(TOP)/src/glut/glx
-
-INCLUDES = -I$(TOP)/include -I$(MARK)
-
-CORE_SOURCES = \
-       bitmap.c \
-       callback.c \
-       color.c \
-       globals.c \
-       init.c \
-       menu.c \
-       models.c \
-       overlay.c \
-       state.c \
-       teapot.c \
-       window.c
-
-
-MARK_SOURCES = \
-       $(MARK)/glut_8x13.c \
-       $(MARK)/glut_9x15.c \
-       $(MARK)/glut_hel10.c \
-       $(MARK)/glut_hel12.c \
-       $(MARK)/glut_hel18.c \
-       $(MARK)/glut_tr10.c \
-       $(MARK)/glut_tr24.c
-
-SOURCES = $(CORE_SOURCES)  $(MARK_SOURCES)
-
-OBJS =  $(SOURCES:.c=.o)
-
-LIBS = -L$(TOP)/lib -lGL -lGLU -lm
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend libglut.so.3.7 install 
-
-libglut.so.3.7: $(OBJS) Makefile.solo
-       gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ 
-
-install: libglut.so.3.7
-       rm -f $(TOP)/lib/libglut.so*
-       install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7
-       ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3
-       ln -s libglut.so.3 $(TOP)/lib/libglut.so
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES) 
-       makedepend -fdepend -Y $(INCLUDES) \
-               $(SOURCES)
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean: depend
-       -rm -f *.o *~ *.o *~ *.so libglut.so.3.7
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/glx/mini/Makefile.solo b/src/glx/mini/Makefile.solo
deleted file mode 100644 (file)
index a35ecb5..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# Build a subset DRI-based libGL.so library.
-# Indirect rendering not supported, etc.
-
-TOP = ../../..
-
-default: linux-solo
-
-C_SOURCES = dispatch.c \
-         dri_util.c \
-         ../../mesa/glapi/glapi.c \
-         ../../mesa/glapi/glthread.c \
-         miniglx.c \
-         miniglx_events.c \
-         xf86drm.c 
-
-OBJECTS = $(C_SOURCES:.c=.o)
-
-INCLUDES = -I. $(INCLUDE_DIRS)
-LIBS = -ldl 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup \
-       -I$(TOP)/src/mesa/drivers/dri/drm/shared
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend libGL.so.1.2
-
-libGL.so.1.2:  $(OBJECTS) Makefile.solo
-       rm -f $@ && gcc -shared -Wl,-soname,libGL.so -Wl,-Bsymbolic $(OBJECTS) $(LIBS) -o $@ 
-       rm -f $(TOP)/lib/libGL.so* 
-       rm -f $(TOP)/lib/miniglx.conf
-       install -D libGL.so.1.2 $(TOP)/lib/libGL.so.1.2
-       ln -s libGL.so.1.2 $(TOP)/lib/libGL.so.1
-       ln -s libGL.so.1 $(TOP)/lib/libGL.so
-       install example.miniglx.conf $(TOP)/lib/miniglx.conf
-
-drmtest: xf86drm.o drmtest.o
-       rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
-
-# 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 $(INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f drmtest $(TOP)/lib/libGL.so*
-       -rm -f libGL.so*
-       -rm -f *.o *~
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/Makefile.solo b/src/mesa/Makefile.solo
deleted file mode 100644 (file)
index 349c42f..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-# Makefile for linux-solo (i.e. stand-alone DRI drivers for miniglx environment)
-# We just generate a mesa.a file which is all the core Mesa sources.  This will
-# get linked into the DRI hardware drivers (name *_dri.so).
-
-
-TOP = ../..
-
-include sources
-
-# The objects we want to make:
-OBJECTS = \
-       $(CORE_OBJECTS) 
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-
-
-x86/matypes.h: main/mtypes.h tnl/t_context.h x86/gen_matypes.c
-       $(CC) $(INCLUDE_DIRS) $(CFLAGS) x86/gen_matypes.c -o x86/gen_matypes
-       ./x86/gen_matypes > x86/matypes.h
-       rm -f x86/gen_matypes x86/*.o
-
-x86/common_x86_asm.o: x86/matypes.h
-
-
-
-##### TARGETS #####
-
-default:
-       @echo "Specify a target configuration"
-
-
-targets: mesa.a
-
-
-# Make archive of core object files for linux-solo DRI drivers
-mesa.a:        $(OBJECTS)
-       rm -f $@
-       ar rcv $@ $(OBJECTS)
-       ranlib $@
-
-
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-dep: $(CORE_SOURCES) $(ASM_SOURCES)
-       makedepend -fdepend -Y $(INCLUDE_DIRS) $(CORE_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.a
-       -rm -f */*.o */*~ */*.o */*~
-       -rm -f drivers/*/*.o drivers/*/*/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/fb/Makefile.solo b/src/mesa/drivers/dri/fb/Makefile.solo
deleted file mode 100644 (file)
index e2894ee..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-DRIVER_SOURCES = fb_dri.c
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(DRI_SOURCES) 
-
-ASM_SOURCES = 
-
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) 
-
-
-default: linux-solo
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend fb_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o *~ *.o *~ *.so
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/ffb/Makefile.solo b/src/mesa/drivers/dri/ffb/Makefile.solo
deleted file mode 100644 (file)
index 76ab992..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# not yet
-# MINIGLX_SOURCES = server/ffb_dri.c 
-
-DRIVER_SOURCES = ffb_bitmap.c \
-                ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.c \
-                ffb_clear.c \
-                ffb_dd.c \
-                ffb_depth.c \
-                ffb_fog.c \
-                ffb_lines.c \
-                ffb_points.c \
-                ffb_span.c \
-                ffb_state.c \
-                ffb_stencil.c \
-                ffb_tex.c \
-                ffb_tris.c \
-                ffb_vb.c \
-                ffb_vtxfmt.c \
-                ffb_xmesa.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-$(SYMLINKS):
-       mkdir -p server
-       cd server
-       rm -f $@ && ln -s ../../radeon/$@ $@
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend ffb_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-       -rm -f $(SYMLINKS)
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/gamma/Makefile.solo b/src/mesa/drivers/dri/gamma/Makefile.solo
deleted file mode 100644 (file)
index 6ad5994..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# $Id: Makefile.solo,v 1.3 2004/03/11 20:35:38 jonsmirl Exp $
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# Not yet
-# MINIGLX_SOURCES = server/gamma_dri.c 
-
-DRIVER_SOURCES = \
-               gamma_context.c \
-               gamma_dd.c \
-               gamma_inithw.c \
-               gamma_lock.c \
-               gamma_render.c \
-               gamma_screen.c \
-               gamma_span.c \
-               gamma_state.c \
-               gamma_tex.c \
-               gamma_texmem.c \
-               gamma_texstate.c \
-               gamma_tris.c \
-               gamma_vb.c \
-               gamma_xmesa.c \
-               ../../common/driverfuncs.c \
-               ../common/mm.c \
-               ../common/utils.c \
-               ../common/texmem.c \
-               ../common/vblank.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend gamma_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/i810/Makefile.solo b/src/mesa/drivers/dri/i810/Makefile.solo
deleted file mode 100644 (file)
index 54075b6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# Not yet
-# MINIGLX_SOURCES = server/i810_dri.c 
-
-DRIVER_SOURCES = \
-               i810context.c \
-               i810ioctl.c \
-               i810render.c \
-               i810screen.c \
-               i810span.c \
-               i810state.c \
-               i810tex.c \
-               i810texmem.c \
-               i810texstate.c \
-               i810tris.c \
-               i810vb.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-               ../common/xmlconfig.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend i810_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/i830/Makefile.solo b/src/mesa/drivers/dri/i830/Makefile.solo
deleted file mode 100644 (file)
index b5c12e3..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# Not yet
-# MINIGLX_SOURCES = server/i830_dri.c 
-
-DRIVER_SOURCES = \
-               i830_context.c \
-               i830_debug.c \
-               i830_ioctl.c \
-               i830_render.c \
-               i830_screen.c \
-               i830_span.c \
-               i830_state.c \
-               i830_tex.c \
-               i830_texmem.c \
-               i830_texstate.c \
-               i830_tris.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend i830_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/mach64/Makefile.solo b/src/mesa/drivers/dri/mach64/Makefile.solo
deleted file mode 100644 (file)
index 8815df6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# Not yet
-# MINIGLX_SOURCES = server/mach64_dri.c 
-
-DRIVER_SOURCES = \
-               mach64_context.c \
-               mach64_ioctl.c \
-               mach64_screen.c \
-               mach64_span.c \
-               mach64_state.c \
-               mach64_tex.c \
-               mach64_texmem.c \
-               mach64_texstate.c \
-               mach64_tris.c \
-               mach64_vb.c \
-               mach64_dd.c \
-               mach64_lock.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend mach64_dri.so
-
-mach64_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/mach64_dri.so && \
-       install mach64_dri.so $(TOP)/lib/mach64_dri.so
-
-$(TOP)/lib/mach64_dri.so:      mach64_dri.so
-       rm -f $(TOP)/lib/mach64_dri.so && \
-       install mach64_dri.so $(TOP)/lib/mach64_dri.so
-
-# 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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/mga/Makefile.solo b/src/mesa/drivers/dri/mga/Makefile.solo
deleted file mode 100644 (file)
index b4cee99..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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
-
-MINIGLX_SOURCES = server/mga_dri.c 
-
-DRIVER_SOURCES = mgadd.c \
-                mgaioctl.c \
-                mgarender.c \
-                mgastate.c \
-                mgatris.c \
-                ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.c
-
-FULL_DRIVER_SOURCES =  \
-                mgapixel.c \
-                mgaspan.c \
-                mgatex.c \
-                mgatexmem.c \
-                mga_texstate.c \
-                mga_texcombine.c \
-                mgavb.c \
-                mga_xmesa.c
-
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(MINIGLX_SOURCES) \
-           $(FULL_DRIVER_SOURCES) \
-           $(DRIVER_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend mga_dri.so
-
-mga_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/mga_dri.so && \
-       install mga_dri.so $(TOP)/lib/mga_dri.so
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/r128/Makefile.solo b/src/mesa/drivers/dri/r128/Makefile.solo
deleted file mode 100644 (file)
index 8017979..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-MINIGLX_SOURCES = server/r128_dri.c 
-
-DRIVER_SOURCES = \
-               r128_context.c \
-               r128_lock.c \
-               r128_state.c \
-               r128_texstate.c \
-               r128_dd.c \
-               r128_screen.c \
-               r128_tex.c \
-               r128_tris.c \
-               r128_ioctl.c \
-               r128_span.c \
-               r128_texmem.c \
-               r128_vb.c \
-               ../../common/driverfuncs.c \
-               ../common/mm.c \
-               ../common/utils.c \
-               ../common/texmem.c \
-               ../common/vblank.c \
-               ../common/xmlconfig.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend r128_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/r200/Makefile.solo b/src/mesa/drivers/dri/r200/Makefile.solo
deleted file mode 100644 (file)
index 68098d6..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-MINIGLX_SOURCES = server/radeon_dri.c 
-
-DRIVER_SOURCES = r200_context.c \
-                r200_ioctl.c \
-                r200_lock.c \
-                r200_screen.c \
-                r200_state.c \
-                r200_state_init.c \
-                ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.c \
-                r200_cmdbuf.c \
-                r200_pixel.c \
-                r200_tex.c \
-                r200_texmem.c \
-                r200_texstate.c \
-                r200_tcl.c \
-                r200_swtcl.c \
-                r200_span.c \
-                r200_maos.c \
-                r200_sanity.c \
-                r200_vtxfmt.c \
-                r200_vtxfmt_c.c \
-                r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
-
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-SYMLINKS = \
-       server/radeon_dri.c \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h
-
-
-$(SYMLINKS):
-       mkdir -p server
-       cd server
-       rm -f $@ && ln -s ../../radeon/$@ $@
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend r200_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-       -rm -f $(SYMLINKS)
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/radeon/Makefile.solo b/src/mesa/drivers/dri/radeon/Makefile.solo
deleted file mode 100644 (file)
index c5387f0..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-ifeq ($(EMBEDDED),true)
-TARGET = 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
-TARGET = 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
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-MINIGLX_SOURCES = server/radeon_dri.c 
-
-DRIVER_SOURCES = radeon_context.c \
-                radeon_ioctl.c \
-                radeon_lock.c \
-                radeon_screen.c \
-                radeon_state.c \
-                radeon_state_init.c \
-                ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.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_tex.c \
-                radeon_texmem.c \
-                radeon_texstate.c \
-                radeon_tcl.c \
-                radeon_swtcl.c \
-                radeon_span.c \
-                radeon_maos.c \
-                radeon_sanity.c \
-                radeon_compat.c \
-                radeon_vtxfmt.c \
-                radeon_vtxfmt_c.c \
-                radeon_vtxfmt_sse.c \
-                radeon_vtxfmt_x86.c 
-
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-ifeq ($(EMBEDDED),true)
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(SUBSET_DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-else
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(FULL_DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-endif
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend $(TARGET)
-
-$(TARGET):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
-       rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
-       rm -f $(TOP)/lib/$(TARGET) && \
-       install $(TARGET) $(TOP)/lib/$(TARGET)
-
-$(TOP)/lib/$(TARGET):  $(TARGET)
-       rm -f $(TOP)/lib/$(TARGET) && \
-       install $(TARGET) $(TOP)/lib/$(TARGET)
-
-# 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)\
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/sis/Makefile.solo b/src/mesa/drivers/dri/sis/Makefile.solo
deleted file mode 100644 (file)
index 4eeeeff..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# Not yet
-# MINIGLX_SOURCES = server/sis_dri.c 
-
-DRIVER_SOURCES = \
-               sis_alloc.c \
-               sis_clear.c \
-               sis_context.c \
-               sis_dd.c \
-               sis_fog.c \
-               sis_lock.c \
-               sis_screen.c \
-               sis_span.c \
-               sis_state.c \
-               sis_stencil.c \
-               sis_tex.c \
-               sis_texstate.c \
-               sis_tris.c \
-               sis_vb.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend sis_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/tdfx/Makefile.solo b/src/mesa/drivers/dri/tdfx/Makefile.solo
deleted file mode 100644 (file)
index 5c94009..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-# not yet
-# MINIGLX_SOURCES = server/tdfx_dri.c 
-
-DRIVER_SOURCES = tdfx_context.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-                ../common/xmlconfig.c \
-                tdfx_dd.c \
-                tdfx_lock.c \
-                tdfx_pixels.c \
-                tdfx_render.c \
-                tdfx_screen.c \
-                tdfx_span.c \
-                tdfx_state.c \
-                tdfx_tex.c \
-                tdfx_texman.c \
-                tdfx_texstate.c \
-                tdfx_tris.c \
-                tdfx_vb.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-$(SYMLINKS):
-       mkdir -p server
-       cd server
-       rm -f $@ && ln -s ../../radeon/$@ $@
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend tdfx_dri.so
-
-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
-
-$(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.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) \
-               $(C_SOURCES) $(ASM_SOURCES)
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-       -rm -f $(SYMLINKS)
-
-
-include $(TOP)/Make-config
-
-include depend
diff --git a/src/mesa/drivers/dri/unichrome/Makefile.solo b/src/mesa/drivers/dri/unichrome/Makefile.solo
deleted file mode 100644 (file)
index 0e1f53a..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-
-# Mesa 3-D graphics library
-# Version:  5.0
-# Copyright (C) 1995-2002  Brian Paul
-
-TOP = ../../../../..
-
-default: linux-solo
-
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-
-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 
-
-MINIGLX_SOURCES = server/via_dri.c 
-
-DRIVER_SOURCES = \
-               via_context.c \
-               via_fb.c \
-               via_ioctl.c \
-               via_render.c \
-               via_screen.c \
-               via_span.c \
-               via_state.c \
-               via_tex.c \
-               via_texmem.c \
-               via_texstate.c \
-               via_tris.c \
-               via_vb.c \
-               xf86drmVIA.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c \
-               ../common/xmlconfig.c \
-               ../../common/driverfuncs.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-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) 
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -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/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-targets: depend unichrome_dri.so
-
-unichrome_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/unichrome_dri.so && \
-       install unichrome_dri.so $(TOP)/lib/unichrome_dri.so
-
-$(TOP)/lib/unichrome_dri.so:   unichrome_dri.so
-       rm -f $(TOP)/lib/unichrome_dri.so && \
-       install unichrome_dri.so $(TOP)/lib/unichrome_dri.so
-
-# 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) \
-               $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o server/*~
-
-
-include $(TOP)/Make-config
-
-include depend