Drop morph3d, add terrain

Subset terrain
Subset isosurf
2003-02-23 21:36:20 +00:00 · 2003-02-23 21:04:38 +00:00 · 2003-02-23 21:04:25 +00:00 · 2003-02-23 20:24:11 +00:00 · 2003-02-23 20:23:34 +00:00 · 2003-02-23 20:16:25 +00:00
2950 changed files with 194424 additions and 805397 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +0,0 @@
 *.dsp -crlf
 *.dsw -crlf
 *.sln -crlf
 *.vcproj -crlf
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +0,0 @@
 *.a
 *.o
 *.so
 *.sw[a-z]
 *.pc
 *~
 depend
 depend.bak
 lib
 lib64
 configure
 autom4te.cache
 aclocal.m4
 config.log
 config.status
 cscope*
--- a/1636
+++ b/1636
--- a/533
+++ b/533
@@ -1,533 +0,0 @@
 # Top-level Mesa makefile
 TOP = .
 SUBDIRS = src progs
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE)) || exit 1 ; \
 		fi \
 	done
 doxygen:
 	cd doxygen && $(MAKE)
 clean:
 	-@touch $(TOP)/configs/current
 	-@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) clean) ; \
 		fi \
 	done
 	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
 realclean: clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 	-rm -f $(TOP)/configs/autoconf
 	-rm -rf autom4te.cache
 	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
 	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 install:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) install) || exit 1 ; \
 		fi \
 	done
 # DirectFBGL module installation
 linux-directfb-install:
 	cd src/mesa/drivers/directfb && $(MAKE) install
 .PHONY: default doxygen clean realclean install linux-directfb-install
 # If there's no current configuration file
 $(TOP)/configs/current:
 	@echo
 	@echo
 	@echo "Please choose a configuration from the following list:"
 	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
 	@echo
 	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
 	@echo
 	@echo "Or, run './configure' then 'make'"
 	@echo "See './configure --help' for details"
 	@echo
 	@echo "(ignore the following error message)"
 	@exit 1
 # Rules to set/install a specific build configuration
 aix \
 aix-64 \
 aix-64-static \
 aix-gcc \
 aix-static \
 autoconf \
 bluegene-osmesa \
 bluegene-xlc-osmesa \
 beos \
 catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
 darwin-static \
 darwin-static-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
 freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
 hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64 \
 hpux11-64-static \
 hpux11-ia64 \
 hpux11-ia64-static \
 hpux9 \
 hpux9-gcc \
 irix6-64 \
 irix6-64-static \
 irix6-n32 \
 irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
 linux-directfb \
 linux-dri \
 linux-dri-debug \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
 linux-indirect \
 linux-fbdev \
 linux-glide \
 linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
 linux-osmesa \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
 linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
 linux-x86-64-static \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
 openbsd \
 osf1 \
 osf1-static \
 solaris-x86 \
 solaris-x86-gcc \
 solaris-x86-gcc-static \
 sunos4 \
 sunos4-gcc \
 sunos4-static \
 sunos5 \
 sunos5-gcc \
 sunos5-64-gcc \
 sunos5-smp \
 sunos5-v8 \
 sunos5-v8-static \
 sunos5-v9 \
 sunos5-v9-static \
 sunos5-v9-cc-g++ \
 ultrix-gcc:
 	@ if test -f configs/current || test -L configs/current ; then \
 		echo "Please run 'make realclean' before changing configs" ; \
 		exit 1 ; \
 	fi
 	(cd configs && rm -f current && ln -s $@ current)
 	$(MAKE) default
 # Rules for making release tarballs
 VERSION=7.4
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
 GLUT_NAME = MesaGLUT-$(VERSION)
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/configure						\
 	$(DIRECTORY)/configure.ac					\
 	$(DIRECTORY)/acinclude.m4					\
 	$(DIRECTORY)/aclocal.m4						\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config.					\
 	$(DIRECTORY)/bin/config.guess					\
 	$(DIRECTORY)/bin/config.sub					\
 	$(DIRECTORY)/bin/install-sh					\
 	$(DIRECTORY)/bin/mklib						\
 	$(DIRECTORY)/bin/minstall					\
 	$(DIRECTORY)/bin/version.mk					\
 	$(DIRECTORY)/configs/[a-z]*					\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/dmesa.h					\
 	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
 	$(DIRECTORY)/include/GL/glu.h					\
 	$(DIRECTORY)/include/GL/glu_mangle.h				\
 	$(DIRECTORY)/include/GL/glx.h					\
 	$(DIRECTORY)/include/GL/glxext.h				\
 	$(DIRECTORY)/include/GL/glx_mangle.h				\
 	$(DIRECTORY)/include/GL/glfbdev.h				\
 	$(DIRECTORY)/include/GL/mesa_wgl.h				\
 	$(DIRECTORY)/include/GL/mglmesa.h				\
 	$(DIRECTORY)/include/GL/osmesa.h				\
 	$(DIRECTORY)/include/GL/svgamesa.h				\
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
 	$(DIRECTORY)/src/Makefile					\
 	$(DIRECTORY)/src/descrip.mms					\
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/sources					\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
 	$(DIRECTORY)/src/mesa/gl.pc.in					\
 	$(DIRECTORY)/src/mesa/osmesa.pc.in				\
 	$(DIRECTORY)/src/mesa/depend					\
 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
 	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
 	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
 	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
 	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms		\
 	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.gc			\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.syn		\
 	$(DIRECTORY)/src/mesa/shader/slang/library/Makefile		\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
 	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
 	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\
 	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
 	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
 	$(DIRECTORY)/src/mesa/drivers/Makefile				\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
 	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile		\
 	$(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c	\
 	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
 	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86/Makefile				\
 	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86/*.S					\
 	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86-64/Makefile				\
 	$(DIRECTORY)/progs/Makefile					\
 	$(DIRECTORY)/progs/util/README					\
 	$(DIRECTORY)/progs/util/*.[ch]					\
 	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
 	$(DIRECTORY)/vms/xlib_share.opt					\
 	$(DIRECTORY)/windows/VC8/
 DRI_FILES = \
 	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/internal/sarea.h			\
 	$(DIRECTORY)/src/glx/Makefile					\
 	$(DIRECTORY)/src/glx/x11/Makefile				\
 	$(DIRECTORY)/src/glx/x11/*.[ch]					\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
 	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch]		\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
 SGI_GLU_FILES = \
 	$(DIRECTORY)/src/glu/Makefile					\
 	$(DIRECTORY)/src/glu/descrip.mms				\
 	$(DIRECTORY)/src/glu/glu.pc.in					\
 	$(DIRECTORY)/src/glu/sgi/Makefile				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
 	$(DIRECTORY)/src/glu/sgi/glu.def				\
 	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
 	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/glu.exports				\
 	$(DIRECTORY)/src/glu/sgi/glu.exports.darwin			\
 	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
 	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
 	$(DIRECTORY)/src/glu/sgi/libtess/README				\
 	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
 	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
 	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
 MESA_GLU_FILES = \
 	$(DIRECTORY)/src/glu/mesa/README[12]		\
 	$(DIRECTORY)/src/glu/mesa/Makefile*		\
 	$(DIRECTORY)/src/glu/mesa/descrip.mms		\
 	$(DIRECTORY)/src/glu/mesa/mms_depend		\
 	$(DIRECTORY)/src/glu/mesa/*.def			\
 	$(DIRECTORY)/src/glu/mesa/depend		\
 	$(DIRECTORY)/src/glu/mesa/*.[ch]
 GLW_FILES = \
 	$(DIRECTORY)/src/glw/*.[ch]			\
 	$(DIRECTORY)/src/glw/Makefile*			\
 	$(DIRECTORY)/src/glw/README			\
 	$(DIRECTORY)/src/glw/glw.pc.in			\
 	$(DIRECTORY)/src/glw/depend
 DEMO_FILES = \
 	$(DIRECTORY)/progs/beos/*.cpp			\
 	$(DIRECTORY)/progs/beos/Makefile		\
 	$(DIRECTORY)/progs/images/*.rgb			\
 	$(DIRECTORY)/progs/images/*.rgba		\
 	$(DIRECTORY)/progs/demos/Makefile*		\
 	$(DIRECTORY)/progs/demos/descrip.mms		\
 	$(DIRECTORY)/progs/demos/*.[ch]			\
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
 	$(DIRECTORY)/progs/fbdev/Makefile		\
 	$(DIRECTORY)/progs/fbdev/glfbdevtest.c		\
 	$(DIRECTORY)/progs/osdemos/Makefile		\
 	$(DIRECTORY)/progs/osdemos/*.c			\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
 	$(DIRECTORY)/progs/xdemos/descrip.mms		\
 	$(DIRECTORY)/progs/xdemos/*.[chf]		\
 	$(DIRECTORY)/progs/redbook/Makefile*		\
 	$(DIRECTORY)/progs/redbook/README		\
 	$(DIRECTORY)/progs/redbook/*.[ch]		\
 	$(DIRECTORY)/progs/samples/Makefile*		\
 	$(DIRECTORY)/progs/samples/README		\
 	$(DIRECTORY)/progs/samples/*.c			\
 	$(DIRECTORY)/progs/glsl/Makefile*		\
 	$(DIRECTORY)/progs/glsl/*.c			\
 	$(DIRECTORY)/progs/glsl/*.frag			\
 	$(DIRECTORY)/progs/glsl/*.vert			\
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
 	$(DIRECTORY)/progs/ggi/*.c			\
 	$(DIRECTORY)/windows/VC6/progs/demos/*.dsp	\
 	$(DIRECTORY)/windows/VC6/progs/progs.dsw	\
 	$(DIRECTORY)/windows/VC7/progs/demos/*.vcproj	\
 	$(DIRECTORY)/windows/VC7/progs/progs.sln
 GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
 	$(DIRECTORY)/src/glut/glx/depend		\
 	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
 	$(DIRECTORY)/src/glut/glx/*def			\
 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.cpp		\
 	$(DIRECTORY)/src/glut/beos/Makefile		\
 	$(DIRECTORY)/src/glut/dos/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
 	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
 	$(DIRECTORY)/src/glut/ggi/Makefile		\
 	$(DIRECTORY)/src/glut/fbdev/Makefile		\
 	$(DIRECTORY)/src/glut/fbdev/*[ch]		\
 	$(DIRECTORY)/src/glut/mini/*[ch]		\
 	$(DIRECTORY)/src/glut/mini/glut.pc.in		\
 	$(DIRECTORY)/src/glut/directfb/Makefile		\
 	$(DIRECTORY)/src/glut/directfb/NOTES		\
 	$(DIRECTORY)/src/glut/directfb/*[ch]		\
 	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
 	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
 DEPEND_FILES = \
 	$(TOP)/src/mesa/depend		\
 	$(TOP)/src/glx/x11/depend	\
 	$(TOP)/src/glw/depend		\
 	$(TOP)/src/glut/glx/depend	\
 	$(TOP)/src/glu/sgi/depend
 LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
 # Everything for new a Mesa release:
 tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \
 	lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
 # Helper for autoconf builds
 ACLOCAL = aclocal
 ACLOCAL_FLAGS =
 AUTOCONF = autoconf
 AC_FLAGS =
 aclocal.m4: configure.ac acinclude.m4
 	$(ACLOCAL) $(ACLOCAL_FLAGS)
 configure: configure.ac aclocal.m4 acinclude.m4
 	$(AUTOCONF) $(AC_FLAGS)
 rm_depend:
 	@for dep in $(DEPEND_FILES) ; do \
 		rm -f $$dep ; \
 		touch $$dep ; \
 	done
 lib_gz:
 	rm -f configs/current ; \
 	rm -f configs/autoconf ; \
 	cd .. ; \
 	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.gz $(DIRECTORY)
 demo_gz:
 	cd .. ; \
 	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 glut_gz:
 	cd .. ; \
 	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
 	gzip $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
 lib_bz2:
 	rm -f configs/current ; \
 	rm -f configs/autoconf ; \
 	cd .. ; \
 	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
 	bzip2 $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 demo_bz2:
 	cd .. ; \
 	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	bzip2 $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 glut_bz2:
 	cd .. ; \
 	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
 	bzip2 $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
 lib_zip:
 	rm -f configs/current ; \
 	rm -f configs/autoconf ; \
 	rm -f $(LIB_NAME).zip ; \
 	cd .. ; \
 	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
 	mv $(LIB_NAME).zip $(DIRECTORY)
 demo_zip:
 	rm -f $(DEMO_NAME).zip ; \
 	cd .. ; \
 	zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)
 glut_zip:
 	rm -f $(GLUT_NAME).zip ; \
 	cd .. ; \
 	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
 	mv $(GLUT_NAME).zip $(DIRECTORY)
 md5:
 	@-md5sum $(LIB_NAME).tar.gz
 	@-md5sum $(LIB_NAME).tar.bz2
 	@-md5sum $(LIB_NAME).zip
 	@-md5sum $(DEMO_NAME).tar.gz
 	@-md5sum $(DEMO_NAME).tar.bz2
 	@-md5sum $(DEMO_NAME).zip
 	@-md5sum $(GLUT_NAME).tar.gz
 	@-md5sum $(GLUT_NAME).tar.bz2
 	@-md5sum $(GLUT_NAME).zip
 .PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \
 	glut_bz2 lib_zip demo_zip glut_zip md5
--- a/Makefile.DJ
+++ b/Makefile.DJ
@@ -1,88 +0,0 @@
 # Mesa 3-D graphics library
 # Version:  4.0
 # 
 # Copyright (C) 1999  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # DOS/DJGPP makefile for Mesa
 #
 #  Author: Daniel Borca
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 #
 #  Available options:
 #
 #    Environment variables:
 #	GLIDE		path to Glide3 SDK; used with FX.
 #			default = $(TOP)/glide3
 #	FX=1		build for 3dfx Glide3. Note that this disables
 #			compilation of most DMesa code and requires fxMesa.
 #			As a consequence, you'll need the DJGPP Glide3
 #			library to build any application.
 #			default = no
 #	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
 #			default = no
 #
 #    Targets:
 #	all:		build everything
 #	libgl:		build GL
 #	libglu:		build GLU
 #	libglut:	build GLUT
 #	clean:		remove object files
 #	realclean:	remove all generated files
 #
 .PHONY : all libgl libglu libglut clean realclean
 CFLAGS = -Wall -W -pedantic
 CFLAGS += -O2 -ffast-math
 export CFLAGS
 ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
 UNLINK = del $(subst /,\,$(1))
 else
 UNLINK = $(RM) $(1)
 endif
 all: libgl libglu libglut
 libgl: lib
 	$(MAKE) -f Makefile.DJ -C src/mesa
 libglu: lib
 	$(MAKE) -f Makefile.DJ -C src/glu/sgi
 libglut: lib
 	$(MAKE) -f Makefile.DJ -C src/glut/dos
 lib:
 	mkdir lib
 clean:
 	$(MAKE) -f Makefile.DJ clean -C src/mesa
 	$(MAKE) -f Makefile.DJ clean -C src/glu/mesa
 	$(MAKE) -f Makefile.DJ clean -C src/glu/sgi
 	$(MAKE) -f Makefile.DJ clean -C src/glut/dos
 realclean: clean
 	-$(call UNLINK,lib/*.a)
 	-$(call UNLINK,lib/*.dxe)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -0,0 +1,765 @@
 # $Id: Makefile.X11,v 1.69 2002/11/13 15:33:51 brianp Exp $
 # Mesa 3-D graphics library
 # Version:  5.0
 # 
 # Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # Top-level makefile for Mesa
 # To add a new configuration for your system add it to the list below
 # then update the Make-config file.
 SHELL = /bin/sh
 default:
 	@echo "Type one of the following:"
 	@echo "  make aix                  for IBM RS/6000 with AIX"
 	@echo "  make aix-sl               for IBM RS/6000, make shared libs"
 	@echo "  make amiwin               for Amiga with SAS/C and AmiWin"
 	@echo "  make amix                 for Amiga 3000 UX  SVR4 v2.1 systems"
 	@echo "  make beos-r4              for BeOS R4"
 	@echo "  make bsdos                for BSD/OS from BSDI using GCC"
 	@echo "  make bsdos4               for BSD/OS 4.x, dynamic libraries"
 	@echo "  make cygnus               for Win95/NT using Cygnus-Win32"
 	@echo "  make cygnus-linux         for Win95/NT using Cygnus-Win32 under Linux"
 	@echo "  make darwin               for Darwin - Mac OS X"
 	@echo "  make dgux                 for Data General"
 	@echo "  make freebsd              for FreeBSD systems with GCC"
 	@echo "  make freebsd-386          for FreeBSD systems with GCC, w/ Intel assembly"
 	@echo "  make gcc                  for a generic system with GCC"
 	@echo "  make hpux9                for HP systems with HPUX 9.x"
 	@echo "  make hpux9-sl             for HP systems with HPUX 9.x, make shared libs"
 	@echo "  make hpux9-gcc            for HP systems with HPUX 9.x using GCC"
 	@echo "  make hpux9-gcc-sl         for HP systems with HPUX 9.x, GCC, make shared libs"
 	@echo "  make hpux10               for HP systems with HPUX 10.x and 11.x"
 	@echo "  make hpux10-sl            for HP systems with HPUX 10.x and 11.x, shared libs"
 	@echo "  make hpux10-gcc           for HP systems with HPUX 10.x w/ GCC"
 	@echo "  make hpux10-gcc-sl        for HP systems with HPUX 10.x w/ GCC, shared libs"
 	@echo "  make irix4                for SGI systems with IRIX 4.x"
 	@echo "  make irix5                for SGI systems with IRIX 5.x"
 	@echo "  make irix5-gcc            for SGI systems with IRIX 5.x using GCC"
 	@echo "  make irix5-dso            for SGI systems with IRIX 5.x, make DSOs"
 	@echo "  make irix6-o32            for SGI systems with IRIX 6.x, make o32-bit libs"
 	@echo "  make irix6-o32-dso        for SGI systems with IRIX 6.x, make o32-bit DSOs"
 	@echo "  make irix6-n32            for SGI systems with IRIX 6.x, make n32-bit libs"
 	@echo "  make irix6-n32-dso        for SGI systems with IRIX 6.x, make n32-bit DSOs"
 	@echo "  make irix6-gcc-n32-sl     for SGI systems with IRIX 6.x, GCC, make n32 DSOs"
 	@echo "  make irix6-64             for SGI systems with IRIX 6.x, make 64-bit libs"
 	@echo "  make irix6-64-dso         for SGI systems with IRIX 6.x, make 64-bit DSOs"
 	@echo "  make linux                for Linux systems, make shared .so libs"
 	@echo "  make linux-static         for Linux systems, make static .a libs"
 	@echo "  make linux-trace          for Linux systems, with API trace extension"
 	@echo "  make linux-x86            for Linux on Intel, make shared .so libs"
 	@echo "  make linux-x86-static     for Linux on Intel, make static .a libs"
 	@echo "  make linux-ggi            for Linux systems with libggi"
 	@echo "  make linux-386-ggi        for Linux systems with libggi w/ Intel assembly"
 	@echo "  make linux-glide          for Linux w/ 3Dfx Glide driver"
 	@echo "  make linux-386-glide      for Linux w/ 3Dfx Glide driver, Intel assembly"
 	@echo "  make linux-386-opt-glide  for Linux with 3Dfx Voodoo1 for GLQuake"
 	@echo "  make linux-x86-glide      for Linux w/ all x86 asm for Glide"
 	@echo "  make linux-alpha          for Linux on Alpha systems"
 	@echo "  make linux-alpha-static   for Linux on Alpha systems, static libs"
 	@echo "  make linux-ppc            for Linux on PowerPC systems"
 	@echo "  make linux-ppc-static     for Linux on PowerPC systems, static libs"
 	@echo "  make linux-sparc          for Linux on Sparc systems"
 	@echo "  make linux-sparc5-elf     for Sparc5 systems, make ELF shared libs"
 	@echo "  make linux-sparc-ultra    for UltraSparc systems, make ELF shared libs"
 	@echo "  make linux-osmesa16       for 16-bit/channel OSMesa"
 	@echo "  make linux-osmesa32       for 32-bit/channel OSMesa"
 	@echo "  make linux-icc            for Linux with the Intel C/C++ compiler"
 	@echo "  make lynxos               for LynxOS systems with GCC"
 	@echo "  make macintosh            for Macintosh"
 	@echo "  make machten-2.2          for Macs w/ MachTen 2.2 (68k w/ FPU)"
 	@echo "  make machten-4.0          for Macs w/ MachTen 4.0.1 or newer with GNU make"
 	@echo "  make mklinux              for Linux on Power Macintosh"
 	@echo "  make netbsd               for NetBSD 1.0 systems with GCC"
 	@echo "  make next                 for NeXT systems with NEXTSTEP 3.3"
 	@echo "  make openbsd              for OpenBSD systems"
 	@echo "  make openstep             for OpenStep/MacOSX Server systems"
 	@echo "  make os2-x11              for OS/2 with XFree86"
 	@echo "  make osf1                 for DEC Alpha systems with OSF/1"
 	@echo "  make osf1-sl              for DEC Alpha systems with OSF/1, make shared libs"
 	@echo "  make pgi-cygnus           for Cygnus with Portland Group, Inc. compiler"
 	@echo "  make pgi-mingw32          for mingW32 with Portland Group, Inc. compiler"
 	@echo "  make qnx                  for QNX V4 systems with Watcom compiler"
 	@echo "  make sco                  for SCO Unix systems with ODT"
 	@echo "  make sco5                 for SCO 5.0.5 OpenServer Unix"
 	@echo "  make solaris-x86          for PCs with Solaris"
 	@echo "  make solaris-x86-gcc      for PCs with Solaris using GCC"
 	@echo "  make sunos4               for Suns with SunOS 4.x"
 	@echo "  make sunos4-sl            for Suns with SunOS 4.x, make shared libs"
 	@echo "  make sunos4-gcc           for Suns with SunOS 4.x and GCC"
 	@echo "  make sunos4-gcc-sl        for Suns with SunOS 4.x, GCC, make shared libs"
 	@echo "  make sunos5               for Suns with SunOS 5.x"
 	@echo "  make sunos5-sl            for Suns with SunOS 5.x, make shared libs"
 	@echo "  make sunos5-ultra         for Sun UltraSPARCs with SunOS 5.x"
 	@echo "  make sunos5-ultra-sl      for Sun UltraSPARCs with SunOS 5.x, make shared libs"
 	@echo "  make sunos5-thread        for Suns with SunOS 5.x, using Solaris threads"
 	@echo "  make sunos5-pthread       for Suns with SunOS 5.[56] using POSIX threads"
 	@echo "  make sunos5-gcc-thread    for Suns with SunOS 5.x and GCC, using Solaris threads"
 	@echo "  make sunos5-gcc-pthread   for Suns with SunOS 5.[56] and GCC, using POSIX threads"
 	@echo "  make sunos5-gcc           for Suns with SunOS 5.x and GCC"
 	@echo "  make sunos5-gcc-sl        for Suns with SunOS 5.x, GCC, make shared libs"
 	@echo "  make sunos5-x11r6-gcc-sl  for Suns with X11R6, GCC, make shared libs"
 	@echo "  make sunos5-gcc-thread    for Suns with SunOS 5.x and GCC, using Solaris threads"
 	@echo "  make sunos5-gcc-pthread   for Suns with SunOS 5.[56] and GCC, using POSIX threads"
 	@echo "  make sunSolaris-CC        for Solaris using C++ compiler"
 	@echo "  make ultrix-gcc           for DEC systems with Ultrix and GCC"
 	@echo "  make unicos               for Cray C90 (and other?) systems"
 	@echo "  make unixware             for PCs running UnixWare"
 	@echo "  make unixware-shared      for PCs running UnixWare, shared libs"
 	@echo "  make uwin                 for Windows NT with AT&T/Wipro UWIN"
 	@echo "  make vistra               for Stardent Vistra systems"
 	@echo "  make clean                remove .o files"
 	@echo "  make realclean            remove .o, library and executable files"
 # XXX we may have to split up this group of targets into those that
 # have a C++ compiler and those that don't for the SI-GLU library.
 aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso \
 linux linux-static linux-debug linux-static-debug linux-prof \
 linux-x86 linux-icc linux-x86-static linux-x86-debug \
 linux-glide linux-386-glide linux-386-opt-glide \
 linux-x86-glide linux-glide-debug linux-glide-prof \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc \
 linux-sparc5-elf \
 linux-sparc-ultra \
 lynxos machten-2.2 machten-4.0 \
 mklinux netbsd osf1 osf1-sl openbsd qnx sco sco5 \
 solaris-x86 solaris-x86-gcc sunSolaris-CC \
 sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
 sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \
 sunos5-thread sunos5-pthread sunos5-gcc-thread sunos5-gcc-pthread \
 sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
 	-mkdir lib
 	if [ -d src      ] ; then touch src/depend      ; fi
 	if [ -d si-glu   ] ; then touch si-glu/depend  ; fi
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
 	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
 	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d si-glu   ] ; then cd si-glu   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
 	-mkdir lib32
 	if [ -d src      ] ; then touch src/depend      ; fi
 	if [ -d src-glu  ] ; then touch src-glu/depend  ; fi
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
 	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
 	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 irix6-64 irix6-64-dso:
 	-mkdir lib64
 	touch src/depend
 	touch src-glu/depend
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
 	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
 	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 amiwin:
 	bin/mklib.amiwin
 beos-r4:
 	-mkdir lib
 	-rm src/depend
 	touch src/depend
 	-rm src-glu/depend
 	touch src-glu/depend
 	if [ -d src     ] ; then cd src     ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d BeOS    ] ; then cd BeOS    ; $(MAKE)                        ; fi
 	if [ -d src-glut.beos ] ; then cd src-glut.beos ; $(MAKE)            ; fi
 	if [ -d src-glut.beos ] ; then cp src-glut.beos/obj*/libglut.so lib  ; fi
 	if [ -d demos   ] ; then cd demos   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d book    ] ; then cd book    ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 pgi-cygnus pgi-mingw32 \
 cygnus cygnus-linux:
 	-mkdir lib
 	touch src/depend
 	touch src-glu/depend
 	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
 	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 macintosh:
 	@echo "See the README file for Macintosh intallation information"
 next:
 	-mkdir lib
 	cd src ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 	cd src-glu ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 openstep:
 	-mkdir lib
 	cd src ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 	cd src-glu ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 os2-x11:
 	if not EXIST .\lib md lib
 	touch src/depend
 	touch src-glu/depend
 	if exist src-glut touch src-glut/depend
 	cd src     & make -f Makefile.X11 $@
 	cd src-glu & make -f Makefile.X11 $@
 	if exist src-glut  cd src-glut & make -f Makefile.X11 $@
 	if exist demos     cd demos    & make -f Makefile.X11 $@
 	if exist xdemos    cd xdemos   & make -f Makefile.X11 $@
 	if exist samples   cd samples  & make -f Makefile.X11 $@
 	if exist book      cd book     & make -f Makefile.X11 $@
 linux-ggi linux-386-ggi:
 	-mkdir lib
 	touch src/depend
 	touch si-glu/depend
 	if [ -d src-glut        ] ; then touch src-glut/depend ; fi
 	if [ -d widgets-sgi     ] ; then touch widgets-sgi/depend ; fi
 	if [ -d ggi             ] ; then touch ggi/depend      ; fi
 	if [ -d src             ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE)      ; fi
 	if [ -d src/GGI/display ] ; then cd src/GGI/display ; $(MAKE)      ; fi
 	if [ -d si-glu ]   ; then cd si-glu   ; $(MAKE) -f Makefile.X11 $@ ; fi
 #	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d ggi ]      ; then cd ggi      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d ggi ]      ; then cd ggi/demos; $(MAKE)                    ; fi
 	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d samples ]  ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d book ]     ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 # if you change GGI_DEST please change it in ggimesa.conf, too.
 DESTDIR=/usr/local
 GGI_DEST=lib/ggi/mesa
 linux-ggi-install linux-386-ggi-install:
 	install -d $(DESTDIR)/$(GGI_DEST)/default $(DESTDIR)/$(GGI_DEST)/display $(DESTDIR)/etc/ggi
 	install -m 0755 src/GGI/default/*.so $(DESTDIR)/$(GGI_DEST)/default
 	install -m 0755 src/GGI/display/*.so $(DESTDIR)/$(GGI_DEST)/display
 	install -m 0644 src/GGI/ggimesa.conf $(DESTDIR)/etc/ggi
 #	if [ -z "`grep ggimesa $(DESTDIR)/etc/ggi/libggi.conf`" ]; then \
 #	echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #	fi
 linux-osmesa16 linux-osmesa32:
 	-mkdir lib
 	if [ -d src ] ; then touch src/depend ; fi
 	if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
 # Remove .o files, emacs backup files, etc.
 clean:
 	-rm -f ggi/*~ *.o
 	-rm -f src/GGI/default/*~ *.so
 	-rm -f src/GGI/display/*~ *.so
 	-rm -f include/*~
 	-rm -f include/GL/*~
 	-rm -f src/*.o src/*~ src/*.a src/*/*.o src/*/*~
 	-rm -f src-glu/*.o src-glu/*~ src-glu/*.a
 	-rm -f si-glu/*/*.o si-glu/*/*/*.o
 	-rm -f src-glut/*.o
 	-rm -f demos/*.o
 	-rm -f book/*.o book/*~
 	-rm -f xdemos/*.o xdemos/*~
 	-rm -f samples/*.o samples/*~
 	-rm -f ggi/*.o ggi/demos/*.o ggi/*.a
 	-rm -f widgets-sgi/*.o
 	-rm -f widgets-mesa/*/*.o
 # Remove everything that can be remade
 realclean: clean
 	-rm -fr lib lib32 lib64
 	cd demos       && $(MAKE) -f Makefile.X11 realclean || true
 	cd xdemos      && $(MAKE) -f Makefile.X11 realclean || true
 	cd book        && $(MAKE) -f Makefile.X11 realclean || true
 	cd samples     && $(MAKE) -f Makefile.X11 realclean || true
 DIRECTORY = Mesa-5.0
 LIB_NAME = MesaLib-5.0
 DEMO_NAME = MesaDemos-5.0
 GLU_NAME = MesaGLU-5.0
 GLUT_NAME = GLUT-3.7
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/Make-config					\
 	$(DIRECTORY)/acconfig.h						\
 	$(DIRECTORY)/acinclude.m4					\
 	$(DIRECTORY)/aclocal.m4						\
 	$(DIRECTORY)/common_rules.make					\
 	$(DIRECTORY)/conf.h.in						\
 	$(DIRECTORY)/config.guess					\
 	$(DIRECTORY)/config.sub						\
 	$(DIRECTORY)/configure						\
 	$(DIRECTORY)/configure.in					\
 	$(DIRECTORY)/install-sh						\
 	$(DIRECTORY)/ltmain.sh						\
 	$(DIRECTORY)/missing						\
 	$(DIRECTORY)/mkinstalldirs					\
 	$(DIRECTORY)/stamp-h.in						\
 	$(DIRECTORY)/docs/CONFORM					\
 	$(DIRECTORY)/docs/COPYING					\
 	$(DIRECTORY)/docs/COPYRIGHT					\
 	$(DIRECTORY)/docs/DEVINFO					\
 	$(DIRECTORY)/docs/INSTALL					\
 	$(DIRECTORY)/docs/INSTALL.GNU					\
 	$(DIRECTORY)/docs/README					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/VERSIONS					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/bin/README						\
 	$(DIRECTORY)/bin/mklib*						\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config						\
 	$(DIRECTORY)/m4/*.m4						\
 	$(DIRECTORY)/xlib.opt						\
 	$(DIRECTORY)/mesawin32.mak					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/Makefile.in				\
 	$(DIRECTORY)/include/GL/Makefile.am				\
 	$(DIRECTORY)/include/GL/dmesa.h					\
 	$(DIRECTORY)/include/GL/amesa.h					\
 	$(DIRECTORY)/include/GL/fxmesa.h				\
 	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
 	$(DIRECTORY)/include/GL/glu.h					\
 	$(DIRECTORY)/include/GL/glu_mangle.h				\
 	$(DIRECTORY)/include/GL/glx.h					\
 	$(DIRECTORY)/include/GL/glxext.h				\
 	$(DIRECTORY)/include/GL/glx_mangle.h				\
 	$(DIRECTORY)/include/GL/mesa_wgl.h				\
 	$(DIRECTORY)/include/GL/mglmesa.h				\
 	$(DIRECTORY)/include/GL/osmesa.h				\
 	$(DIRECTORY)/include/GL/svgamesa.h				\
 	$(DIRECTORY)/include/GL/ugl*.h					\
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa_x.h				\
 	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
 	$(DIRECTORY)/include/GLView.h					\
 	$(DIRECTORY)/include/Makefile.in				\
 	$(DIRECTORY)/include/Makefile.am				\
 	$(DIRECTORY)/src/Makefile*					\
 	$(DIRECTORY)/src/libGL_la_SOURCES				\
 	$(DIRECTORY)/src/descrip.mms					\
 	$(DIRECTORY)/src/mesa.conf					\
 	$(DIRECTORY)/src/*.def						\
 	$(DIRECTORY)/src/depend						\
 	$(DIRECTORY)/src/*.[chS]					\
 	$(DIRECTORY)/src/array_cache/*.[ch]				\
 	$(DIRECTORY)/src/array_cache/Makefile*				\
 	$(DIRECTORY)/src/array_cache/libMesaAC_la_SOURCES		\
 	$(DIRECTORY)/src/math/*.[ch]					\
 	$(DIRECTORY)/src/math/Makefile*					\
 	$(DIRECTORY)/src/swrast/*.[ch]					\
 	$(DIRECTORY)/src/swrast/Makefile*				\
 	$(DIRECTORY)/src/swrast/libMesaSwrast_la_SOURCES		\
 	$(DIRECTORY)/src/swrast_setup/*.[ch]				\
 	$(DIRECTORY)/src/swrast_setup/Makefile*				\
 	$(DIRECTORY)/src/tnl/*.[ch]					\
 	$(DIRECTORY)/src/tnl/Makefile*					\
 	$(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES			\
 	$(DIRECTORY)/src/tnl_dd/*.[ch]					\
 	$(DIRECTORY)/src/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/tnl_dd/imm/NOTES.imm				\
 	$(DIRECTORY)/src/windml/*.[ch]					\
 	$(DIRECTORY)/src/windml/tornado/*.c				\
 	$(DIRECTORY)/src/windml/tornado/*.cdf				\
 	$(DIRECTORY)/src/windml/man3/*.3				\
 	$(DIRECTORY)/src/windml/man3/*.html				\
 	$(DIRECTORY)/src/DOS/*.[chS]					\
 	$(DIRECTORY)/src/DOS/vesa/*.[ch]				\
 	$(DIRECTORY)/src/BeOS/*.cpp					\
 	$(DIRECTORY)/src/FX/Makefile.am					\
 	$(DIRECTORY)/src/FX/Makefile.in					\
 	$(DIRECTORY)/src/FX/libMesaFX_la_SOURCES			\
 	$(DIRECTORY)/src/FX/*.[ch]					\
 	$(DIRECTORY)/src/FX/*.def					\
 	$(DIRECTORY)/src/FX/X86/Makefile.am				\
 	$(DIRECTORY)/src/FX/X86/Makefile.in				\
 	$(DIRECTORY)/src/FX/X86/*.[Shc]					\
 	$(DIRECTORY)/src/GGI/Makefile.am				\
 	$(DIRECTORY)/src/GGI/Makefile.in				\
 	$(DIRECTORY)/src/GGI/*.[ch]					\
 	$(DIRECTORY)/src/GGI/ggimesa.conf.in				\
 	$(DIRECTORY)/src/GGI/default/*.c				\
 	$(DIRECTORY)/src/GGI/default/Makefile.am			\
 	$(DIRECTORY)/src/GGI/default/Makefile.in			\
 	$(DIRECTORY)/src/GGI/default/genkgi.conf.in			\
 	$(DIRECTORY)/src/GGI/display/*.c				\
 	$(DIRECTORY)/src/GGI/display/Makefile.am			\
 	$(DIRECTORY)/src/GGI/display/Makefile.in			\
 	$(DIRECTORY)/src/GGI/display/fbdev.conf.in			\
 	$(DIRECTORY)/src/GGI/include/Makefile.am			\
 	$(DIRECTORY)/src/GGI/include/Makefile.in			\
 	$(DIRECTORY)/src/GGI/include/ggi/Makefile.am			\
 	$(DIRECTORY)/src/GGI/include/ggi/Makefile.in			\
 	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.am		\
 	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.in		\
 	$(DIRECTORY)/src/GGI/include/ggi/mesa/*.h			\
 	$(DIRECTORY)/src/KNOWN_BUGS					\
 	$(DIRECTORY)/src/OSmesa/Makefile.am				\
 	$(DIRECTORY)/src/OSmesa/Makefile.in				\
 	$(DIRECTORY)/src/OSmesa/Makefile.win				\
 	$(DIRECTORY)/src/OSmesa/osmesa.def				\
 	$(DIRECTORY)/src/OSmesa/*.[ch]					\
 	$(DIRECTORY)/src/SPARC/*.[chS]					\
 	$(DIRECTORY)/src/SPARC/Makefile.am				\
 	$(DIRECTORY)/src/SPARC/Makefile.in				\
 	$(DIRECTORY)/src/SVGA/Makefile.am				\
 	$(DIRECTORY)/src/SVGA/Makefile.in				\
 	$(DIRECTORY)/src/SVGA/*.[ch]					\
 	$(DIRECTORY)/src/Trace/*.[ch]					\
 	$(DIRECTORY)/src/Trace/Makefile.am				\
 	$(DIRECTORY)/src/Trace/Makefile.in				\
 	$(DIRECTORY)/src/Windows/*.[ch]					\
 	$(DIRECTORY)/src/Windows/*.def					\
 	$(DIRECTORY)/src/X/Makefile.am					\
 	$(DIRECTORY)/src/X/Makefile.in					\
 	$(DIRECTORY)/src/X/*.[ch]					\
 	$(DIRECTORY)/src/X86/*.[ch]					\
 	$(DIRECTORY)/src/X86/Makefile.am				\
 	$(DIRECTORY)/src/X86/Makefile.in				\
 	$(DIRECTORY)/src/X86/*.S					\
 	$(DIRECTORY)/si-glu/Makefile.am					\
 	$(DIRECTORY)/si-glu/Makefile.in					\
 	$(DIRECTORY)/si-glu/Makefile.X11				\
 	$(DIRECTORY)/si-glu/Makefile.win				\
 	$(DIRECTORY)/si-glu/glu.def					\
 	$(DIRECTORY)/si-glu/dummy.cc					\
 	$(DIRECTORY)/si-glu/descrip.mms					\
 	$(DIRECTORY)/si-glu/mesaglu.opt					\
 	$(DIRECTORY)/si-glu/include/gluos.h				\
 	$(DIRECTORY)/si-glu/include/Makefile.am				\
 	$(DIRECTORY)/si-glu/include/Makefile.in				\
 	$(DIRECTORY)/si-glu/libnurbs/Makefile.am			\
 	$(DIRECTORY)/si-glu/libnurbs/Makefile.in			\
 	$(DIRECTORY)/si-glu/libnurbs/interface/*.h			\
 	$(DIRECTORY)/si-glu/libnurbs/interface/*.cc			\
 	$(DIRECTORY)/si-glu/libnurbs/interface/libNIFac_la_SOURCES	\
 	$(DIRECTORY)/si-glu/libnurbs/interface/Makefile.am		\
 	$(DIRECTORY)/si-glu/libnurbs/interface/Makefile.in		\
 	$(DIRECTORY)/si-glu/libnurbs/internals/*.h			\
 	$(DIRECTORY)/si-glu/libnurbs/internals/*.cc			\
 	$(DIRECTORY)/si-glu/libnurbs/internals/libNInt_la_SOURCES	\
 	$(DIRECTORY)/si-glu/libnurbs/internals/Makefile.am		\
 	$(DIRECTORY)/si-glu/libnurbs/internals/Makefile.in		\
 	$(DIRECTORY)/si-glu/libnurbs/nurbtess/*.h			\
 	$(DIRECTORY)/si-glu/libnurbs/nurbtess/*.cc			\
 	$(DIRECTORY)/si-glu/libnurbs/nurbtess/libNTess_la_SOURCES	\
 	$(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.am		\
 	$(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.in		\
 	$(DIRECTORY)/si-glu/libtess/README				\
 	$(DIRECTORY)/si-glu/libtess/alg-outline				\
 	$(DIRECTORY)/si-glu/libtess/*.[ch]				\
 	$(DIRECTORY)/si-glu/libtess/libtess_la_SOURCES			\
 	$(DIRECTORY)/si-glu/libtess/Makefile.am				\
 	$(DIRECTORY)/si-glu/libtess/Makefile.in				\
 	$(DIRECTORY)/si-glu/libutil/*.[ch]				\
 	$(DIRECTORY)/si-glu/libutil/libutil_la_SOURCES			\
 	$(DIRECTORY)/si-glu/libutil/Makefile.am				\
 	$(DIRECTORY)/si-glu/libutil/Makefile.in				\
 	$(DIRECTORY)/src-glu/README[12]					\
 	$(DIRECTORY)/src-glu/Makefile*					\
 	$(DIRECTORY)/src-glu/descrip.mms				\
 	$(DIRECTORY)/src-glu/mms_depend					\
 	$(DIRECTORY)/src-glu/*.def					\
 	$(DIRECTORY)/src-glu/depend					\
 	$(DIRECTORY)/src-glu/*.[ch]					\
 	$(DIRECTORY)/widgets-mesa/ChangeLog				\
 	$(DIRECTORY)/widgets-mesa/INSTALL				\
 	$(DIRECTORY)/widgets-mesa/Makefile.in				\
 	$(DIRECTORY)/widgets-mesa/README				\
 	$(DIRECTORY)/widgets-mesa/TODO					\
 	$(DIRECTORY)/widgets-mesa/configure				\
 	$(DIRECTORY)/widgets-mesa/configure.in				\
 	$(DIRECTORY)/widgets-mesa/demos/ChangeLog			\
 	$(DIRECTORY)/widgets-mesa/demos/Cube				\
 	$(DIRECTORY)/widgets-mesa/demos/Ed				\
 	$(DIRECTORY)/widgets-mesa/demos/Makefile.in			\
 	$(DIRECTORY)/widgets-mesa/demos/Mcube				\
 	$(DIRECTORY)/widgets-mesa/demos/Tea				\
 	$(DIRECTORY)/widgets-mesa/demos/*.[ch]				\
 	$(DIRECTORY)/widgets-mesa/demos/events				\
 	$(DIRECTORY)/widgets-mesa/include/GL/ChangeLog			\
 	$(DIRECTORY)/widgets-mesa/include/GL/*.h			\
 	$(DIRECTORY)/widgets-mesa/include/GL/Makefile.in		\
 	$(DIRECTORY)/widgets-mesa/man/ChangeLog				\
 	$(DIRECTORY)/widgets-mesa/man/GL*				\
 	$(DIRECTORY)/widgets-mesa/man/Makefile.in			\
 	$(DIRECTORY)/widgets-mesa/man/Mesa*				\
 	$(DIRECTORY)/widgets-mesa/src/ChangeLog				\
 	$(DIRECTORY)/widgets-mesa/src/*.c				\
 	$(DIRECTORY)/widgets-mesa/src/Makefile.in			\
 	$(DIRECTORY)/widgets-sgi/*.[ch]					\
 	$(DIRECTORY)/widgets-sgi/Makefile*				\
 	$(DIRECTORY)/widgets-sgi/README					\
 	$(DIRECTORY)/util/README					\
 	$(DIRECTORY)/util/Makefile.am					\
 	$(DIRECTORY)/util/Makefile.in					\
 	$(DIRECTORY)/util/*.[ch]					\
 	$(DIRECTORY)/util/sampleMakefile				\
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
 	$(DIRECTORY)/vms/xlib_share.opt					\
 	$(DIRECTORY)/BeOS/Makefile					\
 	$(DIRECTORY)/BeOS/*.cpp
 OBSOLETE_LIB_FILES = \
 	$(DIRECTORY)/src/Allegro/*.[ch]					\
 	$(DIRECTORY)/src/D3D/*.cpp					\
 	$(DIRECTORY)/src/D3D/*.CPP					\
 	$(DIRECTORY)/src/D3D/*.h					\
 	$(DIRECTORY)/src/D3D/*.H					\
 	$(DIRECTORY)/src/D3D/*.c					\
 	$(DIRECTORY)/src/D3D/*.C					\
 	$(DIRECTORY)/src/D3D/MAKEFILE					\
 	$(DIRECTORY)/src/D3D/*bat					\
 	$(DIRECTORY)/src/D3D/*DEF					\
 	$(DIRECTORY)/src/DOS/DEPEND.DOS					\
 	$(DIRECTORY)/src/S3/*.[ch]					\
 	$(DIRECTORY)/src/S3/*.def					\
 	$(DIRECTORY)/src/S3/*.mak					\
 	$(DIRECTORY)/src/S3/*.rc					\
 	$(DIRECTORY)/macos/README					\
 	$(DIRECTORY)/macos/gli_api/*.h					\
 	$(DIRECTORY)/macos/cglpane/CGLPane.*				\
 	$(DIRECTORY)/macos/include-mac/*.h				\
 	$(DIRECTORY)/macos/libraries/*.stub				\
 	$(DIRECTORY)/macos/libraries/*Stub				\
 	$(DIRECTORY)/macos/projects/*.mcp				\
 	$(DIRECTORY)/macos/projects/*.exp				\
 	$(DIRECTORY)/macos/projects/*.h					\
 	$(DIRECTORY)/macos/resources/*.c				\
 	$(DIRECTORY)/macos/resources/*.r				\
 	$(DIRECTORY)/macos/resources/*.rsrc				\
 	$(DIRECTORY)/macos/src-agl/*.exp				\
 	$(DIRECTORY)/macos/src-agl/*.[ch]				\
 	$(DIRECTORY)/macos/src-gli/*.[ch]				\
 	$(DIRECTORY)/OpenStep
 DEMO_FILES =	\
 	$(DIRECTORY)/include/GL/glut.h		\
 	$(DIRECTORY)/include/GL/glutf90.h	\
 	$(DIRECTORY)/src-glut/Makefile*		\
 	$(DIRECTORY)/src-glut/depend		\
 	$(DIRECTORY)/src-glut/*def		\
 	$(DIRECTORY)/src-glut/descrip.mms	\
 	$(DIRECTORY)/src-glut/mms_depend	\
 	$(DIRECTORY)/src-glut/*.[ch]		\
 	$(DIRECTORY)/src-glut.dos/*.[ch]	\
 	$(DIRECTORY)/src-glut.dos/Makefile.DJ	\
 	$(DIRECTORY)/src-glut.dos/PC_HW/*.[chS]	\
 	$(DIRECTORY)/images/*			\
 	$(DIRECTORY)/demos/Makefile*		\
 	$(DIRECTORY)/demos/descrip.mms		\
 	$(DIRECTORY)/demos/*.[ch]		\
 	$(DIRECTORY)/demos/*.cxx		\
 	$(DIRECTORY)/demos/*.dat		\
 	$(DIRECTORY)/demos/README		\
 	$(DIRECTORY)/xdemos/Makefile*		\
 	$(DIRECTORY)/xdemos/descrip.mms		\
 	$(DIRECTORY)/xdemos/*.[chf]		\
 	$(DIRECTORY)/book/Makefile*		\
 	$(DIRECTORY)/book/README		\
 	$(DIRECTORY)/book/*.[ch]		\
 	$(DIRECTORY)/samples/Makefile*		\
 	$(DIRECTORY)/samples/README		\
 	$(DIRECTORY)/samples/*.c		\
 	$(DIRECTORY)/mtdemos			\
 	$(DIRECTORY)/windmldemos/Makefile.ugl	\
 	$(DIRECTORY)/windmldemos/*.c		\
 	$(DIRECTORY)/windmldemos/*.bmp		\
 	$(DIRECTORY)/ggi
 OBSOLETE_DEMO_FILES = \
 	$(DIRECTORY)/include/GL/glut_h.dja	\
 	$(DIRECTORY)/src-glut.dja/*		\
 	$(DIRECTORY)/src-glut.beos/Makefile	\
 	$(DIRECTORY)/src-glut.beos/*.cpp	\
 	$(DIRECTORY)/src-glut.beos/*.h		\
 SI_GLU_FILES = \
 	$(DIRECTORY)/Makefile*				\
 	$(DIRECTORY)/Make-config			\
 	$(DIRECTORY)/bin/mklib*				\
 	$(DIRECTORY)/include/GL/glu.h			\
 	$(DIRECTORY)/si-glu/Makefile.X11		\
 	$(DIRECTORY)/si-glu/include/gluos.h		\
 	$(DIRECTORY)/si-glu/libnurbs/interface/*.h	\
 	$(DIRECTORY)/si-glu/libnurbs/interface/*.cc	\
 	$(DIRECTORY)/si-glu/libnurbs/internals/*.h	\
 	$(DIRECTORY)/si-glu/libnurbs/internals/*.cc	\
 	$(DIRECTORY)/si-glu/libnurbs/nurbstess/*.h	\
 	$(DIRECTORY)/si-glu/libnurbs/nurbstess/*.cc	\
 	$(DIRECTORY)/si-glu/libtess/README		\
 	$(DIRECTORY)/si-glu/libtess/alg-outline		\
 	$(DIRECTORY)/si-glu/libtess/*.[ch]		\
 	$(DIRECTORY)/si-glu/libutil/*.[ch]
 GLU_FILES = \
 	$(DIRECTORY)/Makefile*			\
 	$(DIRECTORY)/Make-config		\
 	$(DIRECTORY)/bin/mklib*			\
 	$(DIRECTORY)/include/GL/gl.h		\
 	$(DIRECTORY)/include/GL/gl_mangle.h	\
 	$(DIRECTORY)/include/GL/glext.h		\
 	$(DIRECTORY)/include/GL/glu.h		\
 	$(DIRECTORY)/include/GL/glu_mangle.h	\
 	$(DIRECTORY)/src-glu/README[12]		\
 	$(DIRECTORY)/src-glu/Makefile*		\
 	$(DIRECTORY)/src-glu/descrip.mms	\
 	$(DIRECTORY)/src-glu/mms_depend		\
 	$(DIRECTORY)/src-glu/*.def		\
 	$(DIRECTORY)/src-glu/depend		\
 	$(DIRECTORY)/src-glu/*.[ch]
 GLUT_FILES = \
 	$(DIRECTORY)/Makefile*			\
 	$(DIRECTORY)/Make-config		\
 	$(DIRECTORY)/bin/mklib*			\
 	$(DIRECTORY)/include/GL/gl.h		\
 	$(DIRECTORY)/include/GL/gl_mangle.h	\
 	$(DIRECTORY)/include/GL/glext.h		\
 	$(DIRECTORY)/include/GL/glu.h		\
 	$(DIRECTORY)/include/GL/glu_mangle.h	\
 	$(DIRECTORY)/include/GL/glut.h		\
 	$(DIRECTORY)/include/GL/glutf90.h	\
 	$(DIRECTORY)/src-glut/Makefile*		\
 	$(DIRECTORY)/src-glut/depend		\
 	$(DIRECTORY)/src-glut/*def		\
 	$(DIRECTORY)/src-glut/descrip.mms	\
 	$(DIRECTORY)/src-glut/mms_depend	\
 	$(DIRECTORY)/src-glut/*.[ch]
 OBSOLETE_GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut_h.dja	\
 	$(DIRECTORY)/src-glut.dja/*		\
 	$(DIRECTORY)/src-glut.beos/Makefile	\
 	$(DIRECTORY)/src-glut.beos/*.cpp	\
 	$(DIRECTORY)/src-glut.beos/*.h
 lib_tar:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.gz $(DIRECTORY)
 demo_tar:
 	cd .. ; \
 	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 glu_tar:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
 	gzip $(GLU_NAME).tar ; \
 	mv $(GLU_NAME).tar.gz $(DIRECTORY)
 glut_tar:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
 	gzip $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
 lib_zip:
 	-rm $(LIB_NAME).zip ; \
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
 	mv $(LIB_NAME).zip $(DIRECTORY)
 demo_zip:
 	-rm $(DEMO_NAME).zip ; \
 	cd .. ; \
 	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)
 SRC_FILES =	\
 	RELNOTES		\
 	src/Makefile*		\
 	src/depend		\
 	src/*.[chS]		\
 	src/*/*.[ch]		\
 	include/GL/*.h
 srctar:
 	tar -cvf src.tar $(SRC_FILES) ; \
 	gzip src.tar
 srctar.zip:
 	-rm src.zip
 	zip -r src.zip $(SRC_FILES) ; \
--- a/Makefile.mgw
+++ b/Makefile.mgw
@@ -1,110 +0,0 @@
 # Mesa 3-D graphics library
 # Version:  4.0
 # 
 # Copyright (C) 1999  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # MinGW makefile v1.2 for Mesa
 #
 #  Copyright (C) 2002 - Daniel Borca
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 #
 #  Available options:
 #
 #    Environment variables:
 #	GLIDE		path to Glide3 SDK; used with FX.
 #			default = $(TOP)/glide3
 #	FX=1		build for 3dfx Glide3. Note that this disables
 #			compilation of most WMesa code and requires fxMesa.
 #			As a consequence, you'll need the Win32 Glide3
 #			library to build any application.
 #			default = no
 #	ICD=1		build the installable client driver interface
 #			(windows opengl driver interface)
 #			default = no
 #	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
 #			default = no
 #
 #    Targets:
 #	all:		build everything
 #	libgl:		build GL
 #	clean:		remove object files
 #	realclean:	remove all generated files
 #
 # MinGW core makefile updated for Mesa 7.0
 #
 #  Updated : by Heromyth, on 2007-7-21
 #  Email   : zxpmyth@yahoo.com.cn
 #  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
 #            The others havn't been tested yet.
 #            2) The generated DLLs are *not* compatible with the ones built
 #            with the other compilers like VC8, especially for GLUT. 
 #            3) MAlthough more tests are needed, it can be used individually!
 .PHONY : all libgl clean realclean
 ifeq ($(ICD),1)
  # when -std=c99 mingw will not define WIN32
  CFLAGS = -Wall -Werror
 else
  # I love c89
  CFLAGS = -Wall -pedantic
 endif
 CFLAGS += -O2 -ffast-math
 export CFLAGS
 ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
 UNLINK = del $(subst /,\,$(1))
 else
 UNLINK = $(RM) $(1)
 endif
 all: libgl libglu libglut example
 libgl: lib
 	$(MAKE) -f Makefile.mgw -C src/mesa
 libglu: libgl
 	$(MAKE) -f Makefile.mgw -C src/glu/sgi
 libglut: libglu 
 	$(MAKE) -f Makefile.mgw -C src/glut/glx
 example: libglut 
 	$(MAKE) -f Makefile.mgw star -C progs/samples
 	copy progs\samples\star.exe lib
 lib:
 	mkdir lib
 clean:
 	$(MAKE) -f Makefile.mgw clean -C src/mesa
 	$(MAKE) -f Makefile.mgw clean -C src/glu/sgi
 	$(MAKE) -f Makefile.mgw clean -C src/glut/glx
 realclean: clean
 	-$(call UNLINK,lib/*.a)
 	-$(call UNLINK,lib/*.dll)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,119 +0,0 @@
 # A few convenience macros for Mesa, mostly to keep all the platform
 # specifics out of configure.ac.
 # MESA_PIC_FLAGS()
 #
 # Find out whether to build PIC code using the option --enable-pic and
 # the configure enable_static/enable_shared settings. If PIC is needed,
 # figure out the necessary flags for the platform and compiler.
 #
 # The platform checks have been shamelessly taken from libtool and
 # stripped down to just what's needed for Mesa. See _LT_COMPILER_PIC in
 # /usr/share/aclocal/libtool.m4 or
 # http://git.savannah.gnu.org/gitweb/?p=libtool.git;a=blob;f=libltdl/m4/libtool.m4;hb=HEAD
 #
 AC_DEFUN([MESA_PIC_FLAGS],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_ARG_VAR([PIC_FLAGS], [compiler flags for PIC code])
 AC_ARG_ENABLE([pic],
    [AS_HELP_STRING([--disable-pic],
        [compile PIC objects @<:@default=enabled for shared builds
        on supported platforms@:>@])],
    [enable_pic="$enableval"
    test "x$enable_pic" = x && enable_pic=auto],
    [enable_pic=auto])
 # disable PIC by default for static builds
 if test "$enable_pic" = auto && test "$enable_static" = yes; then
    enable_pic=no
 fi
 # if PIC hasn't been explicitly disabled, try to figure out the flags
 if test "$enable_pic" != no; then
    AC_MSG_CHECKING([for $CC option to produce PIC])
    # allow the user's flags to override
    if test "x$PIC_FLAGS" = x; then
        # see if we're using GCC
        if test "x$GCC" = xyes; then
            case "$host_os" in
            aix*|beos*|cygwin*|irix5*|irix6*|osf3*|osf4*|osf5*)
                # PIC is the default for these OSes.
                ;;
            mingw*|os2*|pw32*)
                # This hack is so that the source file can tell whether
                # it is being built for inclusion in a dll (and should
                # export symbols for example).
                PIC_FLAGS="-DDLL_EXPORT"
                ;;
            darwin*|rhapsody*)
                # PIC is the default on this platform
                # Common symbols not allowed in MH_DYLIB files
                PIC_FLAGS="-fno-common"
                ;;
            hpux*)
                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
                # but not for PA HP-UX.
                case $host_cpu in
                hppa*64*|ia64*)
                    ;;
                *)
                    PIC_FLAGS="-fPIC"
                    ;;
                esac
                ;;
            *)
                # Everyone else on GCC uses -fPIC
                PIC_FLAGS="-fPIC"
                ;;
            esac
        else # !GCC
            case "$host_os" in
            hpux9*|hpux10*|hpux11*)
                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
                # but not for PA HP-UX.
                case "$host_cpu" in
                hppa*64*|ia64*)
                    # +Z the default
                    ;;
                *)
                    PIC_FLAGS="+Z"
                    ;;
                esac
                ;;
            linux*|k*bsd*-gnu)
                case `basename "$CC"` in
                icc*|ecc*|ifort*)
                    PIC_FLAGS="-KPIC"
                    ;;
                pgcc*|pgf77*|pgf90*|pgf95*)
                    # Portland Group compilers (*not* the Pentium gcc
                    # compiler, which looks to be a dead project)
                    PIC_FLAGS="-fpic"
                    ;;
                ccc*)
                    # All Alpha code is PIC.
                    ;;
                xl*)
                    # IBM XL C 8.0/Fortran 10.1 on PPC
                    PIC_FLAGS="-qpic"
                    ;;
                *)
                    case `$CC -V 2>&1 | sed 5q` in
                    *Sun\ C*|*Sun\ F*)
                        # Sun C 5.9 or Sun Fortran
                        PIC_FLAGS="-KPIC"
                        ;;
                    esac
                esac
                ;;
            solaris*)
                PIC_FLAGS="-KPIC"
                ;;
            sunos4*)
                PIC_FLAGS="-PIC"
                ;;
            esac
        fi # GCC
    fi # PIC_FLAGS
    AC_MSG_RESULT([$PIC_FLAGS])
 fi
 AC_SUBST([PIC_FLAGS])
 ])# MESA_PIC_FLAGS
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,16 +0,0 @@
 #! /bin/sh
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 SRCDIR=`(cd "$srcdir" && pwd)`
 ORIGDIR=`pwd`
 if test "x$SRCDIR" != "x$ORIGDIR"; then
 	echo "Mesa cannot be built when srcdir != builddir" 1>&2
 	exit 1
 fi
 autoreconf -v --install || exit 1
 "$srcdir"/configure "$@"
--- a/bin/confdiff.sh
+++ b/bin/confdiff.sh
@@ -1,48 +0,0 @@
 #!/bin/bash -e
 usage()
 {
 	echo "Usage: $0 <target1> <target2>"
 	echo "Highlight differences between Mesa configs"
 	echo "Example:"
 	echo "  $0 linux linux-x86"
 }
 die()
 {
 	echo "$@" >&2
 	return 1
 }
 case "$1" in
 -h|--help) usage; exit 0;;
 esac
 [ $# -lt 2 ] && die 2 targets needed. See $0 --help
 target1=$1
 target2=$2
 topdir=$(cd "`dirname $0`"/..; pwd)
 cd "$topdir"
 [ -f "./configs/$target1" ] || die Missing configs/$target1
 [ -f "./configs/$target2" ] || die Missing configs/$target2
 trap 'rm -f "$t1" "$t2"' 0
 t1=$(mktemp)
 t2=$(mktemp)
 make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t1
 TOP = .
 include \$(TOP)/configs/$target1
 default:
 EOF
 make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t2
 TOP = .
 include \$(TOP)/configs/$target2
 default:
 EOF
 diff -pu -I'^#' $t1 $t2
--- a/bin/config.guess
+++ b/bin/config.guess
--- a/bin/config.sub
+++ b/bin/config.sub
--- a/bin/install-sh
+++ b/bin/install-sh
@@ -1 +0,0 @@
 minstall
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -1,74 +0,0 @@
 #!/bin/sh
 #
 # Simple shell script for installing Mesa's header and library files.
 # If the copy commands below don't work on a particular system (i.e. the
 # -f or -d flags), we may need to branch on `uname` to do the right thing.
 #
 TOP=.
 INCLUDE_DIR="/usr/local/include"
 LIB_DIR="/usr/local/lib"
 if [ "x$#" = "x0" ] ; then
 echo
 echo "***** Mesa installation - You may need root privileges to do this *****"
 echo
 echo "Default directory for header files is:" ${INCLUDE_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ "x${INPUT}" != "x" ] ; then
 	INCLUDE_DIR=${INPUT}
 fi
 echo
 echo "Default directory for library files is:" ${LIB_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ "x${INPUT}" != "x" ] ; then
 	LIB_DIR=${INPUT}
 fi
 echo
 echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
 echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
 echo "Press <Enter> to continue, or <ctrl>-C to abort."
 read INPUT
 else
 INCLUDE_DIR=$1/include
 LIB_DIR=$1/lib
 fi
 # flags:
 #  -f = force
 #  -d = preserve symlinks (does not work on BSD)
 if [ `uname` = "FreeBSD" ] ; then
 	CP_FLAGS="-f"
 elif [ `uname` = "Darwin" ] ; then
 	CP_FLAGS="-f"
 elif [ `uname` = "AIX" ] ; then
 	CP_FLAGS="-fh"
 else
 	CP_FLAGS="-fd"
 fi
 set -v
 mkdir -p ${INCLUDE_DIR}
 mkdir -p ${INCLUDE_DIR}/GL
 # NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
 mkdir -p ${LIB_DIR}
 cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
 cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
 # NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
 cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
 echo "Done."
--- a/bin/minstall
+++ b/bin/minstall
@@ -1,90 +0,0 @@
 #!/bin/sh
 # A minimal replacement for 'install' that supports installing symbolic links.
 # Only a limited number of options are supported:
 # -d dir          Create a directory
 # -m mode         Sets a file's mode when installing
 # If these commands aren't portable, we'll need some "if (arch)" type stuff
 SYMLINK="ln -s"
 MKDIR="mkdir -p"
 RM="rm -f"
 MODE=""
 if [ "$1" = "-d" ] ; then
 	# make a directory path
 	$MKDIR "$2"
 	exit 0
 fi
 if [ "$1" = "-m" ] ; then
 	# set file mode
 	MODE=$2
 	shift 2
 fi
 # install file(s) into destination
 if [ $# -ge 2 ] ; then
 	# Last cmd line arg is the dest dir
 	for FILE in $@ ; do
 		DEST="$FILE"
 	done
 	# Loop over args, moving them to DEST directory
 	I=1
 	for FILE in $@ ; do
 		if [ $I = $# ] ; then
 			# stop, don't want to install $DEST into $DEST
 			exit 0
 		fi
 		PWDSAVE=`pwd`
 		# determine file's type
 		if [ -h "$FILE" ] ; then
 			#echo $FILE is a symlink
 			# Unfortunately, cp -d isn't universal so we have to
 			# use a work-around.
 			# Use ls -l to find the target that the link points to
 			LL=`ls -l "$FILE"`
 			for L in $LL ; do
 				TARGET=$L
 			done
 			#echo $FILE is a symlink pointing to $TARGET
 			FILE=`basename "$FILE"`
 			# Go to $DEST and make the link
 			cd "$DEST"        # pushd
 				$RM "$FILE"
 				$SYMLINK "$TARGET" "$FILE"
 			cd "$PWDSAVE"     # popd
 		elif [ -f "$FILE" ] ; then
 			#echo "$FILE" is a regular file
 			$RM "$DEST/`basename $FILE`"
 			cp "$FILE" "$DEST"
 			if [ $MODE ] ; then
 				FILE=`basename "$FILE"`
 				chmod $MODE "$DEST/$FILE"
 			fi
 		else
 			echo "Unknown type of argument: " "$FILE"
 			exit 1
 		fi
 		I=`expr $I + 1`
 	done
 	exit 0
 fi
 # If we get here, we didn't find anything to do
 echo "Usage:"
 echo "  install -d dir                      Create named directory"
 echo "  install [-m mode] file [...] dest   Install files in destination"
--- a/bin/mklib
+++ b/bin/mklib
@@ -1,942 +0,0 @@
 #!/bin/sh
 # Make a shared library.
 # This script should be useful for projects other than Mesa.
 # Improvements/fixes are welcome.
 # Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Option defaults
 #
 LIBNAME=""
 MAJOR=1
 MINOR=0
 PATCH=""
 DEPS=""
 LINK=""
 LDFLAGS=""
 CPLUSPLUS=0
 STATIC=0
 DLOPEN=0
 INSTALLDIR="."
 ARCH="auto"
 ARCHOPT=""
 NOPREFIX=0
 EXPORTS=""
 ID=""
 #
 # Parse arguments
 #
 while true
 do
    case $1 in
 	'-h' | '--help')
 	    echo 'Usage: mklib [options] objects'
 	    echo 'Create a shared library from object files.'
 	    echo '  -o LIBRARY    specifies the name of the resulting library, without'
 	    echo '                the leading "lib" or any suffix.'
 	    echo '                (eg: "-o GL" might result in "libGL.so" being made)'
 	    echo '  -major N      specifies major version number (default is 1)'
 	    echo '  -minor N      specifies minor version number (default is 0)'
 	    echo '  -patch N      specifies patch version number (default is 0)'
 	    echo '  -lLIBRARY     specifies a dependency on LIBRARY'
 	    echo '  -LDIR         search in DIR for library dependencies at build time'
 	    echo '  -RDIR         search in DIR for library dependencies at run time'
 	    echo '  -linker L     explicity specify the linker program to use (eg: gcc, g++)'
 	    echo '                Not observed on all systems at this time.'
 	    echo '  -ldflags OPT  specify any additional linker flags in OPT'
 	    echo '  -cplusplus    link with C++ runtime'
 	    echo '  -static       make a static library (default is dynamic/shared)'
 	    echo '  -dlopen       make a shared library suitable for dynamic loading'
 	    echo '  -install DIR  put resulting library file(s) in DIR'
 	    echo '  -arch ARCH    override using `uname` to determine host system'
 	    echo '  -archopt OPT  specify an extra achitecture-specific option OPT'
 	    echo '  -altopts OPTS alternate options to override all others'
 	    echo "  -noprefix     don't prefix library name with 'lib' nor add any suffix"
 	    echo '  -exports FILE only export the symbols listed in FILE'
 	    echo '  -id NAME      Sets the id of the dylib (Darwin)'
 	    echo '  -h, --help    display this information and exit'
 	    exit 1
 	    ;;
 	'-o')
 	    shift 1;
 	    LIBNAME=$1
 	    ;;
 	'-major')
 	    shift 1;
 	    MAJOR=$1
 	    ;;
 	'-minor')
 	    shift 1;
 	    MINOR=$1
 	    ;;
 	'-patch')
 	    shift 1;
 	    PATCH=$1
 	    ;;
 	'-linker')
 	    shift 1;
 	    LINK=$1
 	    ;;
 	'-ldflags')
 	    shift 1;
 	    LDFLAGS=$1
 	    ;;
 	-l*)
 	    DEPS="$DEPS $1"
 	    ;;
 	-L*)
 	    DEPS="$DEPS $1"
 	    ;;
 	-R*)
 	    DEPS="$DEPS $1"
 	    ;;
 	-Wl*)
            DEPS="$DEPS $1"
            ;;
 	-pthread)
 	    # this is a special case (see bugzilla 10876)
 	    DEPS="$DEPS $1"
 	    ;;
 	'-pthread')
 	    DEPS="$DEPS -pthread"
 	    ;;
 	'-cplusplus')
 	    CPLUSPLUS=1
 	    ;;
 	'-static')
 	    STATIC=1
 	    ;;
 	'-dlopen')
 	    DLOPEN=1
 	    ;;
 	'-install')
 	    shift 1;
 	    INSTALLDIR=$1
 	    ;;
 	'-arch')
 	    shift 1;
 	    ARCH=$1
 	    ;;
 	'-archopt')
 	    shift 1;
 	    ARCHOPT=$1
 	    ;;
 	'-altopts')
            shift 1;
            ALTOPTS=$1
            ;;
 	'-noprefix')
 	    NOPREFIX=1
 	    ;;
 	'-exports')
 	    shift 1;
 	    EXPORTS=$1
 	    ;;
 	'-id')
 	    shift 1;
 	    ID=$1
 	    ;;
 	-*)
 	    echo "mklib: Unknown option: " $1 ;
 	    exit 1
 	    ;;
 	*)
 	    # This should be the first object file, stop parsing
 	    break
    esac
    shift 1
 done
 OBJECTS=$@
 if [ ${ARCH} = "auto" ] ; then
    ARCH=`uname`
 fi
 #
 # Error checking
 #
 if [ "x${LIBNAME}" = "x" ] ; then
    echo "mklib: Error: no library name specified"
    exit 1
 fi
 if [ "x${OBJECTS}" = "x" ] ; then
    echo "mklib: Error: no object files specified"
    exit 1
 fi
 #
 # Debugging info
 #
 if [  ]  ; then
    echo "-----------------"
    echo ARCH is $ARCH
    echo LIBNAME is $LIBNAME
    echo MAJOR is $MAJOR
    echo MINOR is $MINOR
    echo PATCH is $PATCH
    echo DEPS are $DEPS
    echo "EXPORTS in" $EXPORTS
    echo ID is $ID
    echo "-----------------"
 fi
 #
 # OK, make the library now
 #
 case $ARCH in
    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
 	# we assume gcc
 	if [ "x$LINK" = "x" ] ; then
 	    # -linker was not specified so set default link command now
            if [ $CPLUSPLUS = 1 ] ; then
                LINK=g++
            else
                LINK=gcc
            fi
 	fi
 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
 	    echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
 	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
 		OPTS="-Xlinker -Bsymbolic -shared"
 	    ;;
 	    *)
 		OPTS="-shared"
 	    ;;
 	    esac
 	    # Check if objects are 32-bit and we're running in 64-bit
 	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
 	    ABI32=`file $1 | grep 32-bit`
 	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 		OPTS="-m32 ${OPTS}"
 	    fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            rm -f ${LIBNAME}
            # make lib
            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
            # finish up
            FINAL_LIBS="${LIBNAME}"
        elif [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
            LINK="ar"
            OPTS="-ru"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            rm -f ${LIBNAME}
 	    # expand any .a objects into constituent .o files.
 	    NEWOBJECTS=""
 	    DELETIA=""
 	    for OBJ in ${OBJECTS} ; do
 		if [ `expr match $OBJ '.*\.a'` -gt 0 ] ; then
 		    # extract the .o files from this .a archive
 		    FILES=`ar t $OBJ`
 		    ar x $OBJ
 		    NEWOBJECTS="$NEWOBJECTS $FILES"
 		    # keep track of temporary .o files and delete them below
 		    DELETIA="$DELETIA $FILES"
 		else
 		    # ordinary .o file
 		    NEWOBJECTS="$NEWOBJECTS $OBJ"
 		fi
 	    done
            # make lib
            ${LINK} ${OPTS} ${LIBNAME} ${NEWOBJECTS}
            ranlib ${LIBNAME}
 	    # remove temporary extracted .o files
 	    rm -f ${DELETIA}
            # finish up
            FINAL_LIBS=${LIBNAME}
        else
 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
 	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
 		OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
 	    ;;
 	    *)
 		OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
 	    ;;
 	    esac
 	    if [ $EXPORTS ] ; then
 		#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
 		# Make the 'exptmp' file for --version-script option
 		echo "{" > exptmp
 		echo "global:" >> exptmp
 		sed 's/$/;/' ${EXPORTS} >> exptmp
 		echo "local:" >> exptmp
 		echo "*;" >> exptmp
 		echo "};" >> exptmp
 		OPTS="${OPTS} -Xlinker --version-script=exptmp"
 		# exptmp is removed below
 	    fi
 	    # Check if objects are 32-bit and we're running in 64-bit
 	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
 	    ABI32=`file $1 | grep 32-bit`
 	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 		OPTS="-m32 ${OPTS}"
 	    fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    if [ x${PATCH} = "x" ] ; then
 		VERSION="${MAJOR}.${MINOR}"
 	    else
 		VERSION="${MAJOR}.${MINOR}.${PATCH}"
 	    fi
            echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
            # rm any old libs
            rm -f ${LIBNAME}.so.${VERSION}
            rm -f ${LIBNAME}.so.${MAJOR}
            rm -f ${LIBNAME}.so
            # make lib
            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
            # make usual symlinks
            ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
            ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
            # finish up
            FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
 #	    rm -f exptmp
        fi
 	;;
    'SunOS')
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making SunOS static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar -ruv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    if [ $NOPREFIX = 0 ] ; then
 		LIBNAME="lib${LIBNAME}.so"
 	    fi
 	    echo "mklib: Making SunOS shared library: " ${LIBNAME}
 	    if [ "x$LINK" = "x" ] ; then
 		# -linker was not specified, choose default linker now
 		if [ $CPLUSPLUS = 1 ] ; then
 		    # determine linker and options for C++ code
 		    if [ `which c++` ] ; then
 			# use Sun c++
 			LINK="c++"
 		    elif [ `type g++` ] ; then
 			# use g++
 			LINK="g++"
 		    else
 			echo "mklib: warning: can't find C++ compiler, trying CC."
 			LINK="CC"
 		    fi
 		else
 		    # use native Sun linker for C code
 		    LINK="ld"
 		fi
 	    fi
 	    # linker options
 	    if [ ${LINK} = "ld" -o ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
 		# SunOS tools, -G to make shared libs
 		OPTS="-G"
 	    else
 		# gcc linker
 		# Check if objects are 32-bit and we're running in 64-bit
 		# environment.  If so, pass -m32 flag to linker.
 		set ${OBJECTS}
 		ABI32=`file $1 | grep 32-bit`
 		if [ "${ABI32}" ] ; then
 		    OPTS="-m32 -shared -Wl,-Bdynamic"
 		else
 		    OPTS="-m64 -shared -Wl,-Bdynamic"
 		fi
 	    fi
 	    # If using Sun C++ compiler, need to tell it not to add runpaths
 	    # that are specific to the build machine
 	    if [ ${LINK} = "CC" ] ; then
 		OPTS="${OPTS} -norunpath"
 	    fi
 	    # Solaris linker requires explicitly listing the Standard C & C++
 	    # libraries in the link path when building shared objects
 	    if [ ${LINK} = "CC" ] ; then
 		DEPS="${DEPS} -lCrun"
 	    fi
 	    DEPS="${DEPS} -lc"
 	    if [ $EXPORTS ] ; then
 		# Make the 'mapfile.scope' linker mapfile
 		echo "{" > mapfile.scope
 		echo "global:" >> mapfile.scope
 		sed 's/$/;/' ${EXPORTS} >> mapfile.scope
 		echo "local:" >> mapfile.scope
 		echo "    *;" >> mapfile.scope
 		echo "};" >> mapfile.scope
 		OPTS="${OPTS} -Wl,-Mmapfile.scope"
 	    fi
 	    # Check if objects are SPARC v9
 	    # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
 	    set ${OBJECTS}
 	    if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
 		SPARCV9=`file $1 | grep SPARCV9`
 		if [ "${SPARCV9}" ] ; then
 		    OPTS="${OPTS} -xarch=v9"
 		fi
 	    fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    # for debug:
 	    #echo "mklib: linker is" ${LINK} ${OPTS}
 	    if [ $NOPREFIX = 1 ] ; then
 		rm -f ${LIBNAME}
 		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 		FINAL_LIBS="${LIBNAME}"
 	    else
 		rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
 		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.${MAJOR} -h ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
 		ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
 		FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
 	    fi
 	fi
 	;;
    'FreeBSD')
 	# we assume gcc
 	if [ "x$LINK" = "x" ] ; then
 	    # -linker was not specified so set default link command now
            if [ $CPLUSPLUS = 1 ] ; then
                LINK=g++
            else
                LINK=gcc
            fi
 	fi
 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
 	    echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
 	    OPTS="-shared"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    rm -f ${LIBNAME}
 	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
        elif [ $STATIC = 1 ] ; then
 	    STLIB="lib${LIBNAME}.a"
 	    echo "mklib: Making FreeBSD static library: " ${STLIB}
 	    rm -f ${STLIB}
 	    ar cq ${STLIB} ${OBJECTS}
 	    ranlib ${STLIB}
 	    FINAL_LIBS=${STLIB}
 	else
 	    SHLIB="lib${LIBNAME}.so.${MAJOR}"
 	    OPTS="-shared -Wl,-soname,${SHLIB}"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    echo "mklib: Making FreeBSD shared library: " ${SHLIB}
 	    rm -f ${SHLIB}
 	    ${LINK} ${OPTS} ${LDFLAGS} -o ${SHLIB} ${OBJECTS} ${DEPS}
 	    ln -sf ${SHLIB} "lib${LIBNAME}.so"
 	    FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
 	fi
 	;;
    'NetBSD')
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}_pic.a"
 	    echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar cq ${LIBNAME} ${OBJECTS}
 	    ranlib ${LIBNAME}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
 	    echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
    'IRIX' | 'IRIX64')
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    rm -f ${LIBNAME}
 	    ar rc ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    # examine first object to determine ABI
    	    set ${OBJECTS}
 	    ABI_O32=`file $1 | grep 'ELF 32-bit'`
 	    ABI_N32=`file $1 | grep 'ELF N32'`
 	    ABI_N64=`file $1 | grep 'ELF 64-bit'`
 	    if [ "${ABI_O32}" ] ; then
 		OPTS="-32 -shared -all"
 		ABI="o32-bit"
 	    elif [ "${ABI_N32}" ] ; then
 		OPTS="-n32 -shared -all"
 		ABI="n32-bit"
 	    elif [ "${ABI_N64}" ] ; then
 		OPTS="-64 -shared -all"
 		ABI="64-bit"
 	    else
 		echo "Error: Unexpected IRIX ABI!"
 		exit 1
 	    fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    if [ $CPLUSPLUS = 1 ] ; then
 		LINK="CC"
 	    else
 		LINK="ld"
 	    fi
 	    echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME}
 	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
    'linux-cygwin')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making linux-cygwin library: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	gnuwin32ar ruv ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'HP-UX')
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making HP-UX static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar -ruv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
            # HP uses a .2 for their current GL/GLU libraries
 	    if [ ${LIBNAME} = "GL" -o ${LIBNAME} = "GLU" ] ; then
 	       MAJOR=2
 	    fi
 	    RUNLIB="lib${LIBNAME}.${MAJOR}"
 	    DEVLIB="lib${LIBNAME}.sl"
 	    echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
 	    ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
 	    ln -s ${RUNLIB} ${DEVLIB}
 	    FINAL_LIBS="${RUNLIB} ${DEVLIB}"
 	fi
 	;;
    'AIX' )
 	# examine first object to determine ABI
    	set ${OBJECTS}
 	ABI_64=`file $1 | grep '64-bit'`
 	if [ "${ABI_64}" ] ; then
 	    X64="-X64"
 	    Q64="-q64"
 	    OFILE=shr_64.o
 	else
 	    OFILE=shr.o  #Want to be consistent with the IBM libGL.a
 	fi
 	if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making AIX static library: " ${LIBNAME}
 	    ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    EXPFILE="lib${LIBNAME}.exp"
 	    LIBNAME="lib${LIBNAME}.a"  # shared objects are still stored in the .a libraries
 	    OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry ${Q64}"
 	    rm -f ${EXPFILE} ${OFILE}
 	    NM="/bin/nm -eC ${X64}"
 	    echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
 	    ${NM} ${OBJECTS} | awk '{
 	    if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
 	    && ( substr($1,1,1) != ".")) {
 		    if (substr ($1, 1, 7) != "__sinit" &&
 			    substr ($1, 1, 7) != "__sterm") {
 			    if (substr ($1, 1, 5) == "__tf1")
 				print (substr ($1, 7))
 			    else if (substr ($1, 1, 5) == "__tf9")
 				print (substr ($1, 15))
 			    else
 				print $1
 			}
 		}
 	    }' | sort -u >> ${EXPFILE}
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            # On AIX a shared library is linked differently when
            # you want to dlopen the file
 	    if [ $DLOPEN = "1" ] ; then
 		cc -G ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    else
 		cc ${OPTS} ${LDFLAGS} -o ${OFILE} ${OBJECTS} ${DEPS}
 		ar ${X64} -r ${LIBNAME} ${OFILE}
 	    fi
            FINAL_LIBS="${LIBNAME}"
        fi
        ;;
    'OpenSTEP')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making OpenSTEP static library: " ${LIBNAME}
 	libtool -static -o ${LIBNAME} - ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'OSF1')
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making OSF/1 static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar -ruv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    VERSION="${MAJOR}.${MINOR}"
 	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making OSF/1 shared library: " ${LIBNAME}
 	    if [ "x$LINK" = "x" ] ; then
 		if [ $CPLUSPLUS = 1 ] ; then
 		    LINK=cxx
 		else
 		    LINK=cc
 		fi
 	    fi
 	    rm -f ${LIBNAME}.${VERSION}
 	    ${LINK} -o ${LIBNAME}.${VERSION} -shared -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
 	    ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
 	    FINAL_LIBS="${LIBNAME} ${LIBNAME}.${VERSION}"
 	fi
 	;;
    'Darwin')
        if [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"
            echo "mklib: Making Darwin static library: " ${LIBNAME}
            LINK="ar"
            OPTS="-ruvs"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
            FINAL_LIBS=${LIBNAME}
        else
            # On Darwin a .bundle is used for a library that you want to dlopen
            if [ $DLOPEN = "1" ] ; then
                LIBSUFFIX="bundle"
                OPTS="${ARCHOPT} -bundle -multiply_defined suppress"
            else
                LIBSUFFIX="dylib"
                if [ -z "$ID" ] ; then
                    ID="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
                fi
                OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name ${ID}"
            fi
            if [ ${EXPORTS} ] ; then
                if [ -f ${EXPORTS}".darwin" ] ; then
                    EXPORTS=$EXPORTS".darwin"
                fi
                OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
            fi
            LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
            LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
            LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
 	    # examine first object to determine ABI
    	    set ${OBJECTS}
            ABI_PPC=`file $1 | grep ' ppc'`
            ABI_I386=`file $1 | grep ' i386'`
            ABI_PPC64=`file $1 | grep ' ppc64'`
            ABI_X86_64=`file $1 | grep ' x86_64'`
            if [ "${ABI_PPC}" ] ; then
                OPTS="${OPTS} -arch ppc"
            fi
            if [ "${ABI_I386}" ] ; then
                OPTS="${OPTS} -arch i386"
            fi
            if [ "${ABI_PPC64}" ] ; then
                OPTS="${OPTS} -arch ppc64"
            fi
            if [ "${ABI_X86_64}" ] ; then
                OPTS="${OPTS} -arch x86_64"
            fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
 	    # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
 	    # to OPTS here?
 	    # determine linker
 	    if [ $CPLUSPLUS = 1 ] ; then
 		LINK="g++"
 	    else
 		LINK="cc"
 	    fi
            echo "mklib: Making Darwin shared library: " ${LIBNAME}
            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
            ln -s ${LIBNAME} ${LINKNAME}
            ln -s ${LIBNAME} ${LINKNAME2}
            FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
        fi
        ;;
    'LynxOS')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making LynxOS static library: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	ar ru ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'BeOS')
        if [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"
            echo "mklib: Making BeOS static library: " ${LIBNAME}
            ar -cru "${LIBNAME}" ${OBJECTS}
        else
 	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making BeOS shared library: " ${LIBNAME}
 	    gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
 	    mimeset -f "${LIBNAME}"
 	    # XXX remove the Mesa3D stuff here since mklib isn't mesa-specific.
 	    setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
 	fi
 	FINAL_LIBS=${LIBNAME}
 	;;
    'QNX')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making QNX library: " ${LIBNAME}
 	wlib ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'MorphOS')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making MorphOS library: " ${LIBNAME}
 	ppc-morphos-ar rc ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
    'icc' | 'icc-istatic')
 	# Intel C compiler
 	# This should get merged into the Linux code, above, since this isn't
 	# really a different architecture.
 	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
        if [ $STATIC = 1 ] ; then
            echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
            LINK="ar"
            OPTS="-ruv"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            # make lib
            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
            # finish up
            FINAL_LIBS="${LIBNAME}.a"
        else
            if [ $ARCH = icc-istatic ] ; then
                 OPTS="-shared -i-static -cxxlib-icc"
            else
                 OPTS="-shared"
            fi
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            VERSION="${MAJOR}.${MINOR}.${PATCH}"
            echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
            if [ $CPLUSPLUS = 1 ] ; then
                LINK="icpc"
            else
                LINK="icc"
            fi
            # rm any old libs
            rm -f ${LIBNAME}.so.${VERSION}
            rm -f ${LIBNAME}.so.${MAJOR}
            rm -f ${LIBNAME}.so
            # make lib
            ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
            # make usual symlinks
            ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
            ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
            # finish up
            FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
        fi
 	;;
    'aix-gcc')
 	# AIX with gcc
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making AIX GCC static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar ru ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    echo "mklib: Making AIX GCC shared library: " ${LIBNAME}
 	    # remove old lib
 	    rm -f ${LIBNAME}
 	    # make the lib
 	    gcc -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME}
 	    # NOTE: the application linking with this library must specify
 	    # the -Wl,-brtl flags to gcc
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
    'ultrix')
 	# XXX untested
        if [ $STATIC = 0 ] ; then
 	    echo "mklib: Warning shared libs not supported on Ultrix"
 	fi
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making static library for Ultrix: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	ar ru ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
     CYGWIN*)
 	# GCC-based environment
 	CYGNAME="cyg${LIBNAME}"     # prefix with "cyg"
 	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
        if [ $STATIC = 1 ] ; then
            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
            LINK="ar"
            OPTS="-ru"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            # make lib
            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
 	    ranlib ${LIBNAME}.a
            # finish up
            FINAL_LIBS=${LIBNAME}.a
        else
 	    OPTS="-shared -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
            if [ "${ALTOPTS}" ] ; then
                OPTS=${ALTOPTS}
            fi
            echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}-${MAJOR}.dll
            if [ $CPLUSPLUS = 1 ] ; then
                LINK="g++"
            else
                LINK="gcc"
            fi
            # rm any old libs
            rm -f ${LIBNAME}-${MAJOR}.dll
            rm -f ${LIBNAME}.dll.a
            rm -f ${LIBNAME}.a
            # make lib
            ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
            # make usual symlinks
            ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
            # finish up
            FINAL_LIBS="${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a"
 	    # special case for installing in bin
            FINAL_BINS="${CYGNAME}-${MAJOR}.dll"
        fi
 	;;
    'example')
 	# If you're adding support for a new architecture, you can
 	# start with this:
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making static library for example arch: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar rv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS="${LIBNAME}"
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    echo "mklib: Making shared library for example arch: " ${LIBNAME}
 	    ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS="${LIBNAME}"
 	fi
 	;;
    *)
 	echo "mklib: ERROR: Don't know how to make a static/shared library for" ${ARCH}
 	echo "mklib: Please add necessary commands to mklib script."
 	;;
 esac
 #
 # Put library files into installation directory if specified.
 #
 if [ ${INSTALLDIR} != "." ] ; then
    echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
    mv ${FINAL_LIBS} ${INSTALLDIR}/
 fi
--- a/bin/mklib.aix
+++ b/bin/mklib.aix
@@ -0,0 +1,153 @@
 #!/bin/ksh
 # Make an AIX shared library (tricky!!!)
 # Based on a script from Athanasios G. Gaitatzes (gaitat@vnet.ibm.com)
 # Improved by Greg Thompson <gregt@visix.com> -gt
 #--identification------------------------------------------------------
 # $Id: mklib.aix,v 1.2 1999/09/15 15:10:20 brianp Exp $
 # $Log: mklib.aix,v $
 # Revision 1.2  1999/09/15 15:10:20  brianp
 # added third, tiny version number to arguments
 #
 # Revision 1.1  1999/08/19 13:52:56  brianp
 # initial check-in (post-crash)
 #
 #--common--------------------------------------------------------------
 LIBRARY=$1
 shift 1
 MAJOR=$1
 shift 1
 MINOR=$1
 shift 1
 TINY=$1
 shift 1
 OBJECTS=$*
 #--platform------------------------------------------------------------
 # BASENAME = LIBRARY without .a suffix
 BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
 # Name of exports file
 EXPFILE=${BASENAME}.exp
 # Name of temporary shared lib file
 OFILE=shr.o
 ####OFILE=${BASENAME}.o
 # Remove any old files from previous make
 rm -f ${LIBRARY} ${EXPFILE} ${OFILE}
 # Pick a way to use nm -gt
 NM=${NM-/bin/nm -eC}
 # Determine which version of AIX this is
 AIXVERSION=`uname -v`
 # Pick a way to tell the linker there's no entrypoint -gt
 case ${AIXVERSION}
 {
 	3*)
 		ENTRY='-e _nostart'
 		;;
 	4*)
 		ENTRY=-bnoentry
 		;;
 	*)
 		echo "Error in mklib.aix!"
 		exit 1
 		;;
 }
 # Other libraries which we may be dependent on.  Since we make the libraries
 # in the order libGL.a, libaGLU.a, libglut.a just depends on its predecessor.
 # modified to make otherlibs in the form of -lfoo -gt
 OTHERLIBS=`ls ../lib/*.a | sed "s/..\/lib\/lib/-l/g" | sed "s/\.a//g"`
 ##echo OTHERLIBS are ${OTHERLIBS}
 # Make exports (.exp) file header
 echo "#! ${LIBRARY}" > ${EXPFILE}
 # Append list of exported symbols to exports file -gt
 case ${AIXVERSION}
 {
    3*)
 	${NM} ${OBJECTS} | awk -F'|' '{
 	    if ($3 != "extern" || substr($7,1,1) == " ") continue
 	    sub ("  *", "", $1); sub ("  *", "", $7)
 	    if ( (($7 == ".text") || ($7 == ".data") || ($7 == ".bss"))  \
 		    && ( substr($1,1,1) != ".")) {
 		if (substr ($1, 1, 7) != "__sinit" &&
 			substr ($1, 1, 7) != "__sterm") {
 		    if (substr ($1, 1, 5) == "__tf1")
 			print (substr ($1, 7))
 		    else if (substr ($1, 1, 5) == "__tf9")
 			print (substr ($1, 15))
 		    else
 			print $1
 		}
 	    }
 	}' | sort -u >> ${EXPFILE}
 	;;
    4*)
 	${NM} ${OBJECTS} | awk '{
 	    if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
 		    && ( substr($1,1,1) != ".")) {
 		if (substr ($1, 1, 7) != "__sinit" &&
 			substr ($1, 1, 7) != "__sterm") {
 		    if (substr ($1, 1, 5) == "__tf1")
 			print (substr ($1, 7))
 		    else if (substr ($1, 1, 5) == "__tf9")
 			print (substr ($1, 15))
 		    else
 			print $1
 		}
 	    }
 	}' | sort -u >> ${EXPFILE}
 	;;
 }
 # This next line is a hack to allow full compatibility with IBM's OpenGL
 # libraries.  IBM mistakenly exports glLoadIdentity from the libGLU.a
 # library.  We have to do the same thing.  Problem reported by Yemi Adesanya
 # (adesanya@afsmail.cern.ch) and Patrick Brown (pbrown@austin.ibm.com)
 if [ "${BASENAME}" = libGLU ] ; then
    echo "glLoadIdentity" >> ${EXPFILE}
 fi
 # Make the shared lib file
 cc -o ${OFILE} ${OBJECTS} -L../lib ${OTHERLIBS} -lX11 -lXext -lXmu -lXi -lm -lc -bE:${EXPFILE} -bM:SRE ${ENTRY}
 # Make the .a file
 ar ruv ${LIBRARY} ${OFILE}
 # Put exports file in Mesa lib directory
 mv ${EXPFILE} ../lib
 # Remove OFILE
 rm -f ${OFILE}
 #NOTES
 # AIX 4.x /usr/bin/nm -B patch from ssclift@mach.me.queensu.ca (Simon Clift)
 # Robustified symbol extraction for AIX 3 and 4
 #   Greg Thompson <gregt@visix.com>
--- a/bin/mklib.ar-ruv
+++ b/bin/mklib.ar-ruv
@@ -0,0 +1,38 @@
 #!/bin/sh
 # Make a standard Unix .a library file with 'ar ruv'
 #--identification------------------------------------------------------
 # $Id: mklib.ar-ruv,v 1.2 1999/09/15 15:10:20 brianp Exp $
 # $Log: mklib.ar-ruv,v $
 # Revision 1.2  1999/09/15 15:10:20  brianp
 # added third, tiny version number to arguments
 #
 # Revision 1.1  1999/08/19 13:52:57  brianp
 # initial check-in (post-crash)
 #
 #--common--------------------------------------------------------------
 LIBRARY=$1
 shift 1
 MAJOR=$1
 shift 1
 MINOR=$1
 shift 1
 TINY=$1
 shift 1
 OBJECTS=$*
 #--platform-------------------------------------------------------------
 #ar ruv $LIBRARY $OBJECTS
 ar ru $LIBRARY $OBJECTS
--- a/bin/mklib.solaris
+++ b/bin/mklib.solaris
@@ -0,0 +1,52 @@
 #!/bin/sh
 # Make a Solaris shared library
 # contributed by Arno Hahma (arno@nitro.pp.utu.fi)
 #--identification------------------------------------------------------
 # $Id: mklib.solaris,v 1.2 1999/09/15 15:10:20 brianp Exp $
 # $Log: mklib.solaris,v $
 # Revision 1.2  1999/09/15 15:10:20  brianp
 # added third, tiny version number to arguments
 #
 # Revision 1.1  1999/08/19 13:53:06  brianp
 # initial check-in (post-crash)
 #
 #--common--------------------------------------------------------------
 LIBRARY=$1
 shift 1
 MAJOR=$1
 shift 1
 MINOR=$1
 shift 1
 TINY=$1
 shift 1
 OBJECTS=$*
 #--platform-------------------------------------------------------------
 set -x
 LIBRARY=`basename $LIBRARY .a`
 VERSION=$MAJOR.$MINOR
 echo "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a"
 rm -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
 ar ruv ${LIBRARY}.a ${OBJECTS}
 ld -G -o ${LIBRARY}.so.${VERSION} ${OBJECTS}
 cp ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
 cd ../lib
 ln -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so
--- a/bin/version.mk
+++ b/bin/version.mk
@@ -1,17 +0,0 @@
 #!/usr/bin/make -sf
 # Print the various Mesa version fields. This is mostly used to add the
 # version to configure.
 # This reflects that this script is usually called from the toplevel
 TOP = .
 include $(TOP)/configs/default
 version:
 	@echo $(MESA_VERSION)
 major:
 	@echo $(MESA_MAJOR)
 minor:
 	@echo $(MESA_MINOR)
 tiny:
 	@echo $(MESA_TINY)
--- a/configs/.gitignore
+++ b/configs/.gitignore
@@ -1,2 +0,0 @@
 current
 autoconf
--- a/configs/aix
+++ b/configs/aix
@@ -1,30 +0,0 @@
 # Configuration for AIX, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -O -DAIXV3 -DPTHREADS
 # Misc tools and flags
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
 GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
 GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
 GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
--- a/configs/aix-64
+++ b/configs/aix-64
@@ -1,27 +0,0 @@
 # Configuration for AIX 64-bit, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-64
 # Compiler and flags
 CC = xlc
 CXX = xlC
 CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
--- a/configs/aix-64-static
+++ b/configs/aix-64-static
@@ -1,25 +0,0 @@
 # Configuration for AIX, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-64-static
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 APP_LIB_DEPS = -q64 -L$(TOP)/$(LIB_DIR)  -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
               -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
--- a/configs/aix-gcc
+++ b/configs/aix-gcc
@@ -1,23 +0,0 @@
 # Configuration for AIX with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = aix-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -DAIXV3
 CXXFLAGS = -O2 -DAIXV3
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MKLIB_OPTIONS = -arch aix-gcc
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi
--- a/configs/aix-static
+++ b/configs/aix-static
@@ -1,25 +0,0 @@
 # Configuration for AIX, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-static
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -O -DAIXV3 -DPTHREADS
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
               -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -1,125 +0,0 @@
 # Autoconf configuration
 # Pull in the defaults
 include $(TOP)/configs/default
 # This is generated by configure
 CONFIG_NAME = autoconf
 # Compiler and flags
 CC = @CC@
 CXX = @CXX@
 OPT_FLAGS = @OPT_FLAGS@
 ARCH_FLAGS = @ARCH_FLAGS@
 ASM_FLAGS = @ASM_FLAGS@
 PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@
 CFLAGS = @CPPFLAGS@ @CFLAGS@ \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 LDFLAGS = @LDFLAGS@
 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
 # Assembler
 ASM_SOURCES = @ASM_SOURCES@
 ASM_API = @ASM_API@
 # Misc tools and flags
 MAKE = @MAKE@
 SHELL = @SHELL@
 MKLIB_OPTIONS = @MKLIB_OPTIONS@
 MKDEP = @MKDEP@
 MKDEP_OPTIONS = @MKDEP_OPTIONS@
 # Python and flags (generally only needed by the developers)
 PYTHON2 = python
 PYTHON_FLAGS = -t -O -O
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
 GLUT_LIB = glut
 GLW_LIB = GLw
 OSMESA_LIB = @OSMESA_LIB@
 # Library names (actual file names)
 GL_LIB_NAME = @GL_LIB_NAME@
 GLU_LIB_NAME = @GLU_LIB_NAME@
 GLUT_LIB_NAME = @GLUT_LIB_NAME@
 GLW_LIB_NAME = @GLW_LIB_NAME@
 OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
 # Directories to build
 LIB_DIR = @LIB_DIR@
 SRC_DIRS = @SRC_DIRS@
 GLU_DIRS = @GLU_DIRS@
 DRIVER_DIRS = @DRIVER_DIRS@
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = @PROGRAM_DIRS@
 # Driver specific build vars
 DRI_DIRS = @DRI_DIRS@
 WINDOW_SYSTEM = @WINDOW_SYSTEM@
 USING_EGL = @USING_EGL@
 # Dependencies
 X11_INCLUDES = @X11_INCLUDES@
 # GLw motif setup
 GLW_SOURCES = @GLW_SOURCES@
 MOTIF_CFLAGS = @MOTIF_CFLAGS@
 # Library/program dependencies
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
 # DRI dependencies
 DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
 LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
 LIBDRM_LIB = @LIBDRM_LIBS@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 EXPAT_INCLUDES = @EXPAT_INCLUDES@
 # Autoconf directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 includedir = @includedir@
 # Installation directories (for make install)
 INSTALL_DIR = $(prefix)
 INSTALL_LIB_DIR = $(libdir)
 INSTALL_INC_DIR = $(includedir)
 # DRI installation directories
 DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
 # pkg-config substitutions
 GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
 GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
 GL_PC_CFLAGS = @GL_PC_CFLAGS@
 DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@
 GLU_PC_REQ = @GLU_PC_REQ@
 GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@
 GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@
 GLU_PC_CFLAGS = @GLU_PC_CFLAGS@
 GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@
 GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@
 GLUT_PC_CFLAGS = @GLUT_PC_CFLAGS@
 GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@
 GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
 GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
 OSMESA_PC_REQ = @OSMESA_PC_REQ@
 OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
--- a/configs/beos
+++ b/configs/beos
@@ -1,104 +0,0 @@
 # Configuration for BeOS
 # Written by Philippe Houdoin
 include $(TOP)/configs/default
 CONFIG_NAME = beos
 DEFINES = 	\
 	-DBEOS_THREADS 
 MACHINE=$(shell uname -m)
 ifeq ($(MACHINE), BePC)
 	CPU = x86
 else
 	CPU = ppc
 endif
 ifeq ($(CPU), x86)
 	# BeOS x86 settings
 	DEFINES += \
 		-DGNU_ASSEMBLER \
 		-DUSE_X86_ASM \
 		-DUSE_MMX_ASM \
 		-DUSE_3DNOW_ASM \
 		-DUSE_SSE_ASM
 	ASM_SOURCES = $(X86_SOURCES)
 	ASM_API = $(X86_API)
 	CC = gcc
 	CXX = g++
 	LD = gcc
 	CFLAGS = \
 		-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
 		$(DEFINES)
 	CXXFLAGS = $(CFLAGS)
 	# Work around aliasing bugs - developers should comment this out
 	CFLAGS += -fno-strict-aliasing
 	CXXFLAGS += -fno-strict-aliasing
 	LDFLAGS += -Xlinker
 	ifdef DEBUG
 		CFLAGS   += -g -O0
 		LDFLAGS += -g
 		DEFINES += -DDEBUG
 	else
 		CFLAGS   += -O3
 	endif
 	GLUT_CFLAGS = -fexceptions
 else
 	# BeOS PPC settings
 	CC = mwcc
 	CXX = $(CC)
 	LD = mwldppc
 	CFLAGS = \
 		-w on -requireprotos \
 		$(DEFINES)
 	CXXFLAGS = $(CFLAGS)
 	LDFLAGS += \
 		-export pragma \
 		-init _init_routine_ \
 		-term _term_routine_ \
 		-lroot \
 		/boot/develop/lib/ppc/glue-noinit.a \
 		/boot/develop/lib/ppc/init_term_dyn.o \
 		/boot/develop/lib/ppc/start_dyn.o 
 	ifdef DEBUG
 		CFLAGS   += -g -O0
 		CXXFLAGS += -g -O0
 		LDFLAGS += -g
 	else
 		CFLAGS   += -O7
 		CXXFLAGS += -O7
 	endif
 	GLUT_CFLAGS = -fexceptions
 endif
 # Directories
 SRC_DIRS = mesa glu glut/beos
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
 PROGRAM_DIRS = beos samples redbook demos tests
 # Library/program dependencies
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS =  
 GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
--- a/configs/bluegene-osmesa
+++ b/configs/bluegene-osmesa
@@ -1,33 +0,0 @@
 # Configuration for building only libOSMesa on BlueGene, no Xlib driver
 # This doesn't really have a lot of dependencies, so it should be usable
 # on other (gcc-based) systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = bluegene-osmesa
 # Compiler and flags
 CC = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-gcc
 CXX = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURC
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lOSMesa -lGLU -lm
--- a/configs/bluegene-xlc-osmesa
+++ b/configs/bluegene-xlc-osmesa
@@ -1,29 +0,0 @@
 # Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
 # This doesn't really have a lot of dependencies, so it should be usable
 # on similar systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = bluegene-osmesa
 # Compiler and flags
 CC = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlc
 CXX = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC
 CFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lOSMesa -lGLU -lm
--- a/configs/catamount-osmesa-pgi
+++ b/configs/catamount-osmesa-pgi
@@ -1,32 +0,0 @@
 # Configuration for building only libOSMesa on Cray Xt3
 # for the compute nodes running Catamount using the 
 # Portland Group compiler. The Portland Group toolchain has to be 
 # enabled before using "module switch PrgEnv-gnu PrgEnv-pgi" .
 # This doesn't really have a lot of dependencies, so it should be usable
 # on other similar systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = catamount-osmesa-pgi
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta   -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lOSMesa -lGLU -lm
--- a/configs/config.mgw
+++ b/configs/config.mgw
@@ -1,42 +0,0 @@
 # MinGW config include file updated for Mesa 7.0
 #
 #  Updated : by Heromyth, on 2007-7-21
 #  Email   : zxpmyth@yahoo.com.cn
 #  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
 #            The others havn't been tested yet.
 #            2) The generated DLLs are *not* compatible with the ones built
 #            with the other compilers like VC8, especially for GLUT. 
 #            3) Although more tests are needed, it can be used individually!
 # The generated DLLs by MingW with STDCALL are not totally compatible 
 # with the ones linked by Microsoft's compilers.
 #
 # xxx_USING_STDCALL = 1          Compiling MESA with __stdcall. This is default!
 # 
 # xxx_USING_STDCALL = 0          Compiling MESA without __stdcall. I like this:)
 #  
 # In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
 # different. For example:
 #
 #   GL_USING_STDCALL = 0
 #   GLUT_USING_STDCALL = 1
 # 
 # Suggested setting:
 #
 #     ALL_USING_STDCALL = 1
 #
 # That's default!
 #
 ALL_USING_STDCALL = 1
 ifeq ($(ALL_USING_STDCALL),1)
  GL_USING_STDCALL = 1
  GLUT_USING_STDCALL = 1
 else
  GL_USING_STDCALL = 0
  GLUT_USING_STDCALL = 0
 endif
--- a/configs/darwin
+++ b/configs/darwin
@@ -1,57 +0,0 @@
 # Configuration for Darwin / MacOS X, making dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = darwin
 INSTALL_DIR = /usr/X11
 X11_DIR = $(INSTALL_DIR)
 # Compiler and flags
 CC = gcc
 CXX = gcc
 PIC_FLAGS = -fPIC
 DEFINES =  -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
 	   -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS \
 	   -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
 # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11
 # -DGLX_USE_APPLEGL      - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile
 # -DIN_DRI_DRIVER
 ARCH_FLAGS += $(RC_CFLAGS)
 CFLAGS =  -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \
 	-I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 CXXFLAGS =  -ggdb3 -Os -Wall -fno-strict-aliasing \
 	-I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 # Library names (actual file names)
 GL_LIB_NAME = libGL.dylib
 GLU_LIB_NAME = libGLU.dylib
 GLUT_LIB_NAME = libglut.dylib
 GLW_LIB_NAME = libGLw.dylib
 OSMESA_LIB_NAME = libOSMesa.dylib
 # globs used to install the lib and all symlinks
 GL_LIB_GLOB = libGL.*dylib
 GLU_LIB_GLOB = libGLU.*dylib
 GLUT_LIB_GLOB = libglut.*dylib
 GLW_LIB_GLOB = libGLw.*dylib
 OSMESA_LIB_GLOB = libOSMesa.*dylib
 GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
 # omit glw lib for now:
 SRC_DIRS = glx/x11 mesa glu glut/glx
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
 PROGRAM_DIRS = xdemos
--- a/configs/darwin-fat-32bit
+++ b/configs/darwin-fat-32bit
@@ -1,7 +0,0 @@
 # Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
 RC_CFLAGS=-arch ppc -arch i386
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-fat-32bit
--- a/configs/darwin-fat-all
+++ b/configs/darwin-fat-all
@@ -1,7 +0,0 @@
 # Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
 RC_CFLAGS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-fat-all
--- a/configs/default
+++ b/configs/default
@@ -1,119 +0,0 @@
 # Default/template configuration
 # This is included by other config files which may override some
 # of these variables.
 # Think of this as a base class from which configs are derived.
 CONFIG_NAME = default
 # Version info
 MESA_MAJOR=7
 MESA_MINOR=3
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 # external projects.  This should be useless now that we use libdrm.
 DRM_SOURCE_PATH=$(TOP)/../drm
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -O
 CXXFLAGS = -O
 LDFLAGS =
 GLU_CFLAGS = 
 # Misc tools and flags
 SHELL = /bin/sh
 MKLIB = $(SHELL) $(TOP)/bin/mklib
 MKLIB_OPTIONS = 
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
 INSTALL = $(SHELL) $(TOP)/bin/minstall
 # Tools for regenerating glapi (generally only needed by the developers)
 PYTHON2 = python
 PYTHON_FLAGS = -t -O -O
 INDENT = indent
 INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
 GLUT_LIB = glut
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 # Library names (actual file names)
 GL_LIB_NAME = lib$(GL_LIB).so
 GLU_LIB_NAME = lib$(GLU_LIB).so
 GLUT_LIB_NAME = lib$(GLUT_LIB).so
 GLW_LIB_NAME = lib$(GLW_LIB).so
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 # globs used to install the lib and all symlinks
 GL_LIB_GLOB = $(GL_LIB_NAME)*
 GLU_LIB_GLOB = $(GLU_LIB_NAME)*
 GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
 GLW_LIB_GLOB = $(GLW_LIB_NAME)*
 OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
 # Optional assembly language optimization files for libGL
 ASM_SOURCES = 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
 GLW_SOURCES = GLwDrawA.c
 MOTIF_CFLAGS = -I/usr/include/Motif1.2
 # Directories to build
 LIB_DIR = lib
 SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 # Library dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
 # Program dependencies - specific GL/glut libraries added in Makefiles
 APP_LIB_DEPS = -lm
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
 INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
 INSTALL_INC_DIR = $(INSTALL_DIR)/include
 DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
 # pkg-config substitutions
 GL_PC_REQ_PRIV =
 GL_PC_LIB_PRIV =
 GL_PC_CFLAGS =
 DRI_PC_REQ_PRIV =
 GLU_PC_REQ = gl
 GLU_PC_REQ_PRIV =
 GLU_PC_LIB_PRIV =
 GLU_PC_CFLAGS =
 GLUT_PC_REQ_PRIV =
 GLUT_PC_LIB_PRIV =
 GLUT_PC_CFLAGS =
 GLW_PC_REQ_PRIV =
 GLW_PC_LIB_PRIV =
 GLW_PC_CFLAGS =
 OSMESA_PC_REQ =
 OSMESA_PC_LIB_PRIV =
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -1,31 +0,0 @@
 # Configuration for FreeBSD
 include $(TOP)/configs/default
 CONFIG_NAME = FreeBSD
 # Compiler and flags
 CC = cc
 CXX = c++
 MAKE = gmake
 OPT_FLAGS  = -O2
 PIC_FLAGS  = -fPIC
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
 	-DHZ=100
 X11_INCLUDES = -I/usr/local/include
 CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
 CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 EXTRA_LIB_PATH = -L/usr/local/lib
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -1,54 +0,0 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd
 CONFIG_NAME = freebsd-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O -g
 EXPAT_INCLUDES = -I/usr/local/include
 X11_INCLUDES = -I/usr/local/include
 DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
 	-DHAVE_ALIAS
 CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
 	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 # Library/program dependencies
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
 GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 	-lm -pthread $(LIBDRM_LIB)
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 # Directories
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
 DRM_SOURCE_PATH=$(TOP)/../drm
 # ffb and gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
 	   unichrome savage sis
--- a/configs/freebsd-dri-amd64
+++ b/configs/freebsd-dri-amd64
@@ -1,10 +0,0 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86-64
 ASM_FLAGS = -DUSE_X86_64_ASM
 ASM_SOURCES = $(X86-64_SOURCES)
 ASM_API = $(X86-64_API)
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -1,13 +0,0 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/hpux10
+++ b/configs/hpux10
@@ -1,14 +0,0 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
 APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux10-gcc
+++ b/configs/hpux10-gcc
@@ -1,20 +0,0 @@
 # Configuration for HPUX v10, with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM
 CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux10-static
+++ b/configs/hpux10-static
@@ -1,30 +0,0 @@
 # Configuration for HPUX v10, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++
--- a/configs/hpux11-32
+++ b/configs/hpux11-32
@@ -1,30 +0,0 @@
 # Configuration for HPUX v11
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
 GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-32-static
+++ b/configs/hpux11-32-static
@@ -1,27 +0,0 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
--- a/configs/hpux11-32-static-nothreads
+++ b/configs/hpux11-32-static-nothreads
@@ -1,26 +0,0 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-64
+++ b/configs/hpux11-64
@@ -1,31 +0,0 @@
 # Configuration for HPUX v11, 64-bit
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
 GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-64-static
+++ b/configs/hpux11-64-static
@@ -1,27 +0,0 @@
 # Configuration for HPUX v11, 64-bit, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
--- a/configs/hpux11-ia64
+++ b/configs/hpux11-ia64
@@ -1,30 +0,0 @@
 # Configuration for HPUX IA64 v11, 64-bit
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-ia64
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.so
 GLU_LIB_NAME = libGLU.so
 GLUT_LIB_NAME = libglut.so
 GLW_LIB_NAME = libGLw.so
 OSMESA_LIB_NAME = libOSMesa.so
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-ia64-static
+++ b/configs/hpux11-ia64-static
@@ -1,27 +0,0 @@
 # Configuration for HPUX v11, 64-bit, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-ia64-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl
--- a/configs/hpux9
+++ b/configs/hpux9
@@ -1,16 +0,0 @@
 # Configuration for HPUX v9, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9
 # Compiler and flags
 CC = cc
 # XXX fix this
 CXX = c++
 CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
 CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux9-gcc
+++ b/configs/hpux9-gcc
@@ -1,14 +0,0 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9-gcc
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/irix6-64
+++ b/configs/irix6-64
@@ -1,17 +0,0 @@
 # Configuration for IRIX 6.x, make n64 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib64
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm
--- a/configs/irix6-64-static
+++ b/configs/irix6-64-static
@@ -1,26 +0,0 @@
 # Configuration for IRIX 6.x, make n64 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib64
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-n32
+++ b/configs/irix6-n32
@@ -1,17 +0,0 @@
 # Configuration for IRIX 6.x, make n32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm
--- a/configs/irix6-n32-static
+++ b/configs/irix6-n32-static
@@ -1,25 +0,0 @@
 # Configuration for IRIX 6.x, make n32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-o32
+++ b/configs/irix6-o32
@@ -1,18 +0,0 @@
 # Configuration for IRIX 6.x, make o32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
--- a/configs/irix6-o32-static
+++ b/configs/irix6-o32-static
@@ -1,25 +0,0 @@
 # Configuration for IRIX 6.x, make o32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/linux
+++ b/configs/linux
@@ -1,37 +0,0 @@
 # Configuration for generic Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux
 # Compiler and flags
 CC = gcc
 CXX = g++
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
 # to build properly on 64-bit platforms.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(X11_INCLUDES) 
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 GLUT_CFLAGS = -fexceptions
 EXTRA_LIB_PATH = -L/usr/X11R6/lib
--- a/configs/linux-alpha
+++ b/configs/linux-alpha
@@ -1,22 +0,0 @@
 # Configuration for Linux on Alpha
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-alpha-static
+++ b/configs/linux-alpha-static
@@ -1,31 +0,0 @@
 # Configuration for Linux on Alpha, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -1,8 +0,0 @@
 # Configuration for debugging on Linux
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-debug
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH
--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -1,38 +0,0 @@
 # Configuration for DirectFB
 include $(TOP)/configs/default
 CONFIG_NAME = linux-directfb
 # Compiler and flags
 CC  = gcc
 CXX = g++
 CFLAGS   = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
         -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
 CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE   
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
 ifeq ($(HAVE_X86), yes)
     CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
     CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
     ASM_SOURCES = $(X86_SOURCES)
     ASM_API = $(X86_API)
 endif
 # Directories
 SRC_DIRS     = mesa glu glut/directfb
 GLU_DIRS     = sgi
 DRIVER_DIRS  = directfb
 PROGRAM_DIRS = demos directfb
 # Library/program dependencies
 GL_LIB_DEPS   = -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB)
 APP_LIB_DEPS  = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -1,74 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 OPT_FLAGS  = -O -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl $(LIBDRM_LIB)
 # This is now 0 by default since it seems to confuse the hell out of people
 # and generate a lot of extra noise on bugzilla.  If you need to build with
 # EGL, do 'make linux-dri USING_EGL=1'
 USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
 PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
 PROGRAM_DIRS = xdemos
 endif
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -1,16 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-debug
 OPT_FLAGS  = -O0 -g
 ARCH_FLAGS = -DDEBUG
 # Helpful to reduce the amount of stuff that gets built sometimes:
 #DRI_DIRS = i915tex i915 
 #DRI_DIRS = i965
 #DRI_DIRS = radeon r200 r300
 #DRI_DIRS = unichrome sis trident
 #DRI_DIRS = i810 mga r128 tdfx
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -1,17 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-ppc
 OPT_FLAGS = -Os -mcpu=603
 PIC_FLAGS = -fPIC
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
 ASM_SOURCES = $(PPC_SOURCES)
 # Build only the drivers for cards that exist on PowerPC.  At some point MGA
 # will be added, but not yet.
 DRI_DIRS = mach64 r128 r200 r300 radeon tdfx
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -1,14 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-x86
 # Add -m32 to CFLAGS:
 ARCH_FLAGS = -m32
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -1,24 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-x86-64
 ARCH_FLAGS = -m64
 ASM_FLAGS = -DUSE_X86_64_ASM
 ASM_SOURCES = $(X86-64_SOURCES)
 ASM_API = $(X86-64_API)
 LIB_DIR = lib64
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 # ffb, gamma, and sis are missing because they have not be converted to use
 # the new interface.  i810 are missing because there is no x86-64
 # system where they could *ever* be used.
 #
 DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -1,73 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri-xcb
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 OPT_FLAGS  = -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl $(LIBDRM_LIB) `pkg-config --libs xcb` \
 		`pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
 # This is now 0 by default since it seems to confuse the hell out of people
 # and generate a lot of extra noise on bugzilla.  If you need to build with
 # EGL, do 'make linux-dri USING_EGL=1'
 USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
 PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
 PROGRAM_DIRS = xdemos
 endif
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb 
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -1,19 +0,0 @@
 # Configuration for Linux fbdev interface
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-fbdev
 CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 SRC_DIRS = mesa glu glut/fbdev
 DRIVER_DIRS = fbdev osmesa
 PROGRAM_DIRS = fbdev demos redbook samples
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
 OSMESA_LIB_DEPS = -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
--- a/configs/linux-glide
+++ b/configs/linux-glide
@@ -1,23 +0,0 @@
 # Configuration for generic Linux with 3Dfx Glide driver
 include $(TOP)/configs/default
 CONFIG_NAME = linux-glide
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
--- a/configs/linux-ia64-icc
+++ b/configs/linux-ia64-icc
@@ -1,21 +0,0 @@
 # Configuration for Linux with Intel C compiler
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -arch icc-istatic
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) 
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
--- a/configs/linux-ia64-icc-static
+++ b/configs/linux-ia64-icc-static
@@ -1,27 +0,0 @@
 # Configuration for Linux with Intel C compiler, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc-static
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static -arch icc-istatic
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS =
 GLU_LIB_DEPS =
 GLUT_LIB_DEPS =
 GLW_LIB_DEPS =
 APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -1,22 +0,0 @@
 # Configuration for Linux with Intel C compiler
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc
 # Compiler and flags
 CC = icc
 CXX = g++
 CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -arch icc
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -1,27 +0,0 @@
 # Configuration for Linux with Intel C compiler, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc-static
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static -arch icc
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS =
 GLUT_LIB_DEPS =
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -1,53 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-indirect: Builds a libGL capable of indirect
 # rendering, but *NOT* capable of direct rendering.
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 WARN_FLAGS = -Wall
 OPT_FLAGS  = -O -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DGLX_INDIRECT_RENDERING \
 	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(ASM_FLAGS) -std=c99 -ffast-math 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 # Directories
 SRC_DIRS = glx/x11 glu glut/glx glw
 DRIVER_DIRS =
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -1,28 +0,0 @@
 # Configuration for building only libOSMesa on Linux, no Xlib driver
 # This doesn't really have any Linux dependencies, so it should be usable
 # on other (gcc-based) systems.
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lm -lpthread
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -1,31 +0,0 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.so
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lm -lpthread
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -1,32 +0,0 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 APP_LIB_DEPS = -lm -lpthread
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -1,31 +0,0 @@
 # Configuration for 32 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa32
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa32
 OSMESA_LIB_NAME = libOSMesa32.so
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lm -lpthread
--- a/configs/linux-ppc
+++ b/configs/linux-ppc
@@ -1,9 +0,0 @@
 # Configuration for Linux on PPC
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-ppc
 OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
 # FIXME: Use of PowerPC assembly should be enabled here.
--- a/configs/linux-ppc-static
+++ b/configs/linux-ppc-static
@@ -1,15 +0,0 @@
 # Configuration for Linux on PPC, static libs
 include $(TOP)/configs/linux-ppc
 CONFIG_NAME = linux-ppc-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -1,29 +0,0 @@
 # Configuration for profiling on Linux with gprof
 include $(TOP)/configs/default
 CONFIG_NAME = linux-profile
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG
 CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG
 GLUT_CFLAGS = -fexceptions
 # Need to have -L/usr/X11R6/lib in these:
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
 # Need to make static libs for profiling:
 MKLIB_OPTIONS = -static
 GL_LIB_NAME = lib$(GL_LIB).a
 GLU_LIB_NAME = lib$(GLU_LIB).a
 GLUT_LIB_NAME = lib$(GLUT_LIB).a
 GLW_LIB_NAME = lib$(GLW_LIB).a
 OSMESA_LIB_NAME = lib$(OSMesa).a
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -1,54 +0,0 @@
 # Configuration for linux-solo: Linux DRI hardware drivers for fbdev
 include $(TOP)/configs/default
 CONFIG_NAME = linux-solo
 # Compiler and flags
 CC = gcc
 CXX = g++
 WARN_FLAGS = -Wall -Wundef
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 # DRM and pciaccess
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 PCIACCESS_CFLAGS = `pkg-config --cflags pciaccess`
 PCIACCESS_LIB = `pkg-config --libs pciaccess`
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DHAVE_ALIAS
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(ASM_FLAGS) -std=c99 -ffast-math 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 # Directories
 SRC_DIRS = glx/mini mesa glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 #DRI_DIRS = ffb gamma sis savage tdfx unichrome fb
 DRI_DIRS = i810 i915tex i915 mach64 mga r128 r200 radeon
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -1,7 +0,0 @@
 # Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
 include $(TOP)/configs/linux-solo
 CONFIG_NAME = linux-solo-ia64
 DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -1,10 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86
 include $(TOP)/configs/linux-solo
 CONFIG_NAME = linux-solo-x86
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/linux-sparc
+++ b/configs/linux-sparc
@@ -1,9 +0,0 @@
 # Configuration for Linux on Sparc
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-sparc
 #ASM_FLAGS = -DUSE_SPARC_ASM
 #ASM_SOURCES = $(SPARC_SOURCES)
 #ASM_API = $(SPARC_API)
--- a/configs/linux-sparc5
+++ b/configs/linux-sparc5
@@ -1,7 +0,0 @@
 # Configuration for Linux on Sparc5
 include $(TOP)/configs/linux-sparc
 CONFIG_NAME = linux-sparc5
 ARCH_FLAGS += -mcpu=ultrasparc
--- a/configs/linux-static
+++ b/configs/linux-static
@@ -1,26 +0,0 @@
 # Configuration for generic Linux, making static libs
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 # Need to specify all libraries we may need
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
 	-lstdc++ -lm
--- a/configs/linux-ultrasparc
+++ b/configs/linux-ultrasparc
@@ -1,7 +0,0 @@
 # Configuration for Linux on UltraSparc
 include $(TOP)/configs/linux-sparc
 CONFIG_NAME = linux-ultrasparc
 ARCH_FLAGS += -mv8 -mtune=ultrasparc
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -1,9 +0,0 @@
 # Configuration for Linux with x86 optimizations
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-x86
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
--- a/configs/linux-x86-32
+++ b/configs/linux-x86-32
@@ -1,7 +0,0 @@
 # To build Linux x86 32-bit in an x86-64 environment
 include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-32
 ARCH_FLAGS += -m32
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -1,14 +0,0 @@
 # Configuration for Linux for 64-bit X86 (Opteron)
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-x86-64
 ARCH_FLAGS = -m64
 ASM_SOURCES = $(X86-64_SOURCES)
 ASM_API = $(X86-64_API)
 ASM_FLAGS = -DUSE_X86_64_ASM
 LIB_DIR = lib64
 EXTRA_LIB_PATH = -L/usr/X11R6/lib64
--- a/configs/linux-x86-64-debug
+++ b/configs/linux-x86-64-debug
@@ -1,7 +0,0 @@
 # Configuration for Linux for 64-bit X86 (Opteron)
 include $(TOP)/configs/linux-x86-64
 CONFIG_NAME = linux-x86-64-debug
 DEFINES += -DDEBUG -DDEBUG_MATH
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -1,24 +0,0 @@
 # Configuration for Linux for 64-bit X86 (Opteron), static libs
 include $(TOP)/configs/linux-x86-64
 CONFIG_NAME = linux-x86-64-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
 	-lstdc++ -lm
--- a/configs/linux-x86-debug
+++ b/configs/linux-x86-debug
@@ -1,9 +0,0 @@
 # Configuration for Linux with x86 code, but no gcc optimizations and 
 # debugging enabled.
 include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-debug
 OPT_FLAGS = -g
 DEFINES += -DDEBUG -DDEBUG_MATH
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -1,28 +0,0 @@
 # Configuration for Linux with 3Dfx Glide driver and x86 optimizations
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86-glide
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
 CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = $(X86_SOURCES)
 ASM_API = $(X86_API)
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -1,24 +0,0 @@
 # Configuration for Linux with x86 optimizations, static libs
 include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
 	-lstdc++ -lm
--- a/configs/netbsd
+++ b/configs/netbsd
@@ -1,17 +0,0 @@
 # Configuration for NetBSD
 include $(TOP)/configs/default
 CONFIG_NAME = netbsd
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
 CXXFLAGS = -O2 -fPIC
 GLUT_CFLAGS = -fexceptions
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
--- a/configs/openbsd
+++ b/configs/openbsd
@@ -1,22 +0,0 @@
 # Configuration for OpenBSD
 include $(TOP)/configs/default
 CONFIG_NAME = openbsd
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
 CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Keith Whitwell	4b930d3080	Drop morph3d, add terrain	2003-02-23 21:36:20 +00:00
Keith Whitwell	2b3cd85107	Subset terrain	2003-02-23 21:04:38 +00:00
Keith Whitwell	12acb24b60	Subset isosurf	2003-02-23 21:04:25 +00:00
Keith Whitwell	b4bc6375d1	fix some compiler warnings	2003-02-23 20:24:11 +00:00
Keith Whitwell	c91deeffc4	Fail if detected chipset isn't an r100.	2003-02-23 20:23:34 +00:00
Keith Whitwell	728dade650	Fix radeon_tex_region_t declaration (char became int).	2003-02-23 20:16:25 +00:00
Keith Whitwell	c3ded1b33d	clean up header usage	2003-02-23 19:38:23 +00:00
Keith Whitwell	080ae6edb5	Add stricter compiler warnings	2003-02-23 19:37:52 +00:00
Keith Whitwell	b8bc33a6b1	add 'void' to glXGetProcAddress prototype	2003-02-23 19:37:15 +00:00
Keith Whitwell	1d7c610c2b	Add manytex demo	2003-02-23 19:27:31 +00:00
Keith Whitwell	70130333c2	Use correct pv for flatshaded quadstrips	2003-02-23 19:27:03 +00:00
Keith Whitwell	c608a0fb2a	Exclude lighting, userclip state	2003-02-23 19:26:32 +00:00
Keith Whitwell	7f35ecd070	subset demos	2003-02-23 19:25:07 +00:00
Brian Paul	ef9f2d4296	added radeon_subset to header	2003-02-23 17:25:22 +00:00
Jose Fonseca	27b8f1d3ae	Final documentation fixes and additions.	2003-02-23 16:50:46 +00:00
Jose Fonseca	c35fb58c35	A few documention fixes and additions.	2003-02-23 15:21:36 +00:00
Jose Fonseca	eb998b80ea	Last bits of documentation. Full review still pending.	2003-02-23 02:19:13 +00:00
Jose Fonseca	b77ca3d2b7	More documentation - now almost complete.	2003-02-22 21:27:17 +00:00
Jose Fonseca	cdc64176f9	More documention additions.	2003-02-22 11:48:50 +00:00
Jose Fonseca	da69c37f98	Bunch of documention additions.	2003-02-22 09:17:11 +00:00
Keith Whitwell	661a236d09	Correctly initialize RE_LINE_PATTERN register	2003-02-21 23:59:15 +00:00
Keith Whitwell	b9f8f7f6a4	Eliminate non-subset operations	2003-02-21 23:07:40 +00:00
Keith Whitwell	66f40571e1	Eliminate use of glRectf, sleep so that we see some frames.	2003-02-21 22:20:08 +00:00
Keith Whitwell	6620693116	Eliminate use of glRectf	2003-02-21 22:18:24 +00:00
Brian Paul	730cacfa01	sample MiniGLX program	2003-02-21 21:55:58 +00:00
Keith Whitwell	2f05ae32c5	new file	2003-02-21 21:55:26 +00:00
Keith Whitwell	d9ed9e1a9a	Restrict access to non-subset gl entrypoints. Other small cleanups.	2003-02-21 21:14:08 +00:00
Keith Whitwell	6133ba36ec	Fix vertex copying bug, remove polygonmode support (didn't/couldn't work)	2003-02-21 21:12:51 +00:00
Jose Fonseca	4b5f9479eb	Renamed and tailored the radeon doxygen file for the OpenGL subset only	2003-02-16 21:42:11 +00:00
Jose Fonseca	75019b24d1	Initial/partial documentation to the functions/structures that make the Radeon subset driver.	2003-02-16 20:48:08 +00:00
Jose Fonseca	c9118dfaba	A new doxygen configuration file for the Radeon driver.	2003-02-10 17:59:46 +00:00
Jose Fonseca	a140417be9	Most of the documentation to the "server-side" part of the Radeon driver.	2003-02-10 17:58:52 +00:00
Keith Whitwell	ccf4e3e8f2	Eliminate all remaining fallbacks & usage of FALLBACK macro Rename subset_feedback.c to subset_select.c... Add new file subset_tex.c which agressively subsets texture operations.	2003-02-07 20:22:16 +00:00
Keith Whitwell	78e1fee39b	Add files to allow the subset driver to be built as a dri driver. At the moment have to choose to build as either a dri or a miniglx driver, but shouldn't be too hard to build one driver that will work in both environments.	2003-02-05 04:37:12 +00:00
Keith Whitwell	75ccd62be8	Add unfilled rendering and code for feedback (not yet integrated)	2003-02-03 21:33:02 +00:00
Brian Paul	cd9df92c9d	clarified glPolygonMode section	2003-02-03 15:00:38 +00:00
Keith Whitwell	cfe59bd3f9	Eliminate some more code	2003-01-28 22:37:23 +00:00
Keith Whitwell	62bc31dcae	Eliminate radeon_subset_tcl.c.	2003-01-28 18:28:54 +00:00
Keith Whitwell	675f151c42	Fix compilation for full driver build. Subsetted readpixels seems to be working.	2003-01-27 16:55:30 +00:00
Keith Whitwell	151cd27866	New file containing subsetted readpixels implementation.	2003-01-24 17:11:10 +00:00
Keith Whitwell	c8facc28cc	Isolated code for lighting, fog, texgen and userclip in new files. Moved some existing swrast, swtnl specific code into files that don't get built in the subsetted driver.	2003-01-24 15:52:52 +00:00
Keith Whitwell	086e00e086	Add new defines for lighting, texgen, userclip subsetting. Remove unused mesa modules from link.	2003-01-24 15:50:52 +00:00
Brian Paul	49116e9fd2	terminology updates, etc	2003-01-23 17:15:38 +00:00
Keith Whitwell	9d0eff73b5	Bitmaps are right-way-up	2003-01-23 10:43:59 +00:00
Keith Whitwell	81c7427ddc	Hook in accelerated bitmap function -- bitmaps are upside-down!	2003-01-22 18:21:32 +00:00
Keith Whitwell	9e3c6f3b8e	(Partially) subsetted driver runs miniglxtest and texobj. Other applications segfault at null function pointers, etc -- need to remove these entrypoints from miniglx libGL.so.	2003-01-22 18:16:33 +00:00
Keith Whitwell	18a5321288	Rename radeon_bitmap.c to radeon_subset_bitmap.c Add new file radeon_subset_tcl.c -- this is temporary and will go away eventually. Some code removal in radeon_subset_vtx.c	2003-01-22 16:19:42 +00:00
Keith Whitwell	4c864746d6	Add new files for bitmap and subsetted begin/end processing.	2003-01-22 12:23:20 +00:00
Keith Whitwell	19b1476515	Start subsetting -- turn off swrast & swtnl.	2003-01-22 09:53:49 +00:00
Brian Paul	2005348110	updated a few of the issues in appendix A	2003-01-20 17:55:55 +00:00
Brian Paul	634a7b2f00	describe libGL	2003-01-20 15:01:39 +00:00
Brian Paul	d73e21620a	new Makefiles for miniglx	2003-01-20 14:54:50 +00:00
Keith Whitwell	d5cfbef5ad	Remove -C option to install	2003-01-20 14:50:18 +00:00
Jose Fonseca	1d08fddfe6	Tell CVS to ignore Doxygen tag files and output directories.	2003-01-20 14:34:41 +00:00
Jose Fonseca	447ea351dd	Some spellchecking fixes.	2003-01-20 14:30:04 +00:00
Keith Whitwell	0ebc838481	Add USE_MINIGLX flags. Build as a miniglx application.	2003-01-20 11:26:30 +00:00
Keith Whitwell	14a7a05251	Make more demanding	2003-01-20 11:25:50 +00:00
Keith Whitwell	c2edc07196	Fix typo	2003-01-20 11:24:17 +00:00
Keith Whitwell	222a212569	Build radeon.o from toplevel makefile. Add comments to example.miniglx.conf. Install a minglx.conf in lib directory. Remove unused 'drmModuleName' config option	2003-01-20 10:53:34 +00:00
Keith Whitwell	78469e6e3d	Notes on setting up a machine to run MiniGLX apps and a list of available demos in the source tree.	2003-01-20 10:51:04 +00:00
Brian Paul	63d0a9055c	minor fixes (remove some \internal attributes)	2003-01-19 23:48:32 +00:00
Keith Whitwell	27834f06b8	Some documentation updates relating to recent changes	2003-01-19 20:11:26 +00:00
Jose Fonseca	c262531518	Fixed several typos from spell-checking.	2003-01-19 18:47:53 +00:00
Jose Fonseca	1b2c02ae98	Some documentation fixes that were left out of previous commits	2003-01-19 14:23:45 +00:00
Jose Fonseca	fb5f90d71b	Rewriten some of the detail documentation to improve readability. Several fixes.	2003-01-19 14:08:20 +00:00
Jose Fonseca	4fb1eb7be2	Add the missing detailed documentation bits on miniglx.c and xf86drm.c. Several updates and fixes to the documentation.	2003-01-19 12:18:08 +00:00
Jose Fonseca	cf119744c3	More detailed documentation.	2003-01-19 01:57:45 +00:00
Keith Whitwell	b07ed0113a	Use frontbuffer if GLUT_DOUBLE not requested	2003-01-18 19:59:27 +00:00
Jose Fonseca	d6d8d1dfce	Detailed documention for glapi.c. Brief description of the structures in sarea.h. Minor fix in drm.h.	2003-01-18 13:42:06 +00:00
Jose Fonseca	f483ebddeb	Enable the documentation of static functions and also the internal documentation.	2003-01-18 13:01:17 +00:00
Keith Whitwell	35fe61ce7b	Remove debug printf	2003-01-18 12:41:55 +00:00
Keith Whitwell	c3b1d1e63c	Restore registers clobbered by radeonfb.o -- prevents slowdown to 200fps of mesa demos.	2003-01-18 12:41:34 +00:00
Keith Whitwell	38bfead7d3	Remove some unused members from RADEONInfoRec, add saved value for crtc_offset_cntl	2003-01-18 12:38:40 +00:00
Keith Whitwell	56f57500b9	Add PostValidateMode hook to allow drivers to restore registers after fbdev has finished clobbering them.	2003-01-18 12:25:56 +00:00
Keith Whitwell	2ce0615ef1	Remove chipset line from example miniglx.conf	2003-01-18 12:17:02 +00:00
Keith Whitwell	559af8ace4	Probe for chipset if one isn't supplied	2003-01-18 12:16:16 +00:00
Keith Whitwell	f73e37e154	A standalone build environment for radeonfb.o, incorporating necessary fixes from Ani Joshi and others. This is probably the only version of radeonfb that we can run against at the moment, so include it here.	2003-01-18 11:15:47 +00:00
Brian Paul	ec5b054b8f	fix up loose ends	2003-01-17 21:45:04 +00:00
Brian Paul	8a63d4bc99	new Makefiles for subset	2003-01-17 21:21:57 +00:00
Keith Whitwell	f58e67787f	Get colors working in 16bpp	2003-01-17 19:01:22 +00:00
Keith Whitwell	deb4d4de47	add support for 16bpp modes, disabled	2003-01-17 16:19:15 +00:00
Keith Whitwell	1449a2f759	Take stride properly into account when setting up window members.	2003-01-17 00:56:14 +00:00
Keith Whitwell	f0b66442e8	Clear framebuffer at startup	2003-01-17 00:36:05 +00:00
Keith Whitwell	8830b0a941	Make miniglut exit() on error, like real glut.	2003-01-17 00:32:50 +00:00
Keith Whitwell	deb5fe3b68	use a fixed resolution defined in a config file	2003-01-16 23:39:30 +00:00
Brian Paul	1e1e71e3a7	lots of updates, practically finished	2003-01-16 23:15:28 +00:00
Keith Whitwell	53362d8858	get conform working	2003-01-14 16:52:40 +00:00
Keith Whitwell	af82796ed1	Remove debug printf	2003-01-14 11:39:11 +00:00
Jose Fonseca	6ded963ac6	Documentation for most of the DRM ioctls argument structures in drm.h. Fixes to the xf86drm.c documentation.	2003-01-13 16:02:32 +00:00
Keith Whitwell	b4f35d5191	example miniglx.conf	2003-01-13 15:34:00 +00:00
Keith Whitwell	0b9434aafd	Add config file facility and remove hardwired options from minglx.c Move functionality for setting up glx configs into the drivers. Allow the driver to tweak modes (eg for pitch) before setting up fbdev.	2003-01-13 15:31:31 +00:00
Jose Fonseca	fb02d9f4eb	Big chunk of documention of xf86drm.c. Some oddities left to document, and still needs a review to catch typos.	2003-01-13 14:36:40 +00:00
Brian Paul	2b83583994	s/union/enum/	2003-01-11 14:13:25 +00:00
Brian Paul	76415ea859	tweaks to Doxygen config files	2003-01-10 21:57:59 +00:00
Brian Paul	10d05983ef	documentation updates	2003-01-10 21:57:41 +00:00
Brian Paul	7c35ac6e82	doc updates, new PixelFormat enum	2003-01-10 21:56:04 +00:00
Keith Whitwell	ca9cccd81c	Fix GLUT_ELAPSED_TIME query	2003-01-10 17:47:49 +00:00
Jose Fonseca	ea9f98b04b	Enable internal documentation in doxy/miniglx.doxy. Enable private and static documention in doxy/core.doxy (necessary now for src/glapi.c and others later).	2003-01-09 20:37:02 +00:00
Brian Paul	8b4a34dcdb	Initial check in.	2003-01-09 18:24:46 +00:00
Keith Whitwell	267bc32309	Add documentation for GLX_DEPTH_SIZE	2003-01-09 16:54:49 +00:00
Keith Whitwell	8618425250	Remove some more unused functions	2003-01-09 15:16:57 +00:00
Keith Whitwell	24259ec2d0	Bump window sizes up to next supported size when choosing modes. Recognize the GLX_DEPTH_SIZE attrib.	2003-01-09 15:16:35 +00:00
Keith Whitwell	97aa6f3734	Initialize lastStamp to 1, so that drivers know they need to update (ie initialize) their internal data.	2003-01-09 15:15:33 +00:00
Keith Whitwell	6b723c7720	Add section on porting apps glx->miniglx	2003-01-09 15:14:24 +00:00
Keith Whitwell	211f26ca95	more cleanups	2003-01-09 15:13:49 +00:00
Keith Whitwell	df7cbe873e	Remove earlier workaround	2003-01-09 15:12:38 +00:00
Keith Whitwell	da8a7e15a6	Build the full driver for now	2003-01-09 15:12:04 +00:00
Keith Whitwell	f6546f8384	Barebones glut-alike - just enough to get the mesa demos working	2003-01-09 12:43:40 +00:00
Keith Whitwell	cd22e4b78c	Remove some debug	2003-01-03 11:37:10 +00:00
Keith Whitwell	5ff65a62df	Require radeon.o 1.8.x	2003-01-02 19:02:23 +00:00
Keith Whitwell	fd55975710	Take advantage of the fact that the kernel module can now shut itself down cleanly	2003-01-02 18:49:34 +00:00
Keith Whitwell	c83b869ed2	Cleanups	2003-01-02 18:47:05 +00:00
Keith Whitwell	592250e9fc	Add a bit of compile-time flexibility	2003-01-02 18:44:41 +00:00
Keith Whitwell	cdb267a918	Allow the standard radeon driver to be built without the swrast and swtnl modules. This effectively merges the radeon-es driver back into the radeon driver as a compile-time option.	2002-12-30 17:24:05 +00:00
Keith Whitwell	2c2bcf8268	Lay ground work for cut-down radeon driver. NOTE: commented out a couple of places where core mesa calls directly into the swrast module.	2002-12-30 15:20:35 +00:00
Keith Whitwell	695b197cb2	Bring some more initialization code from the 2d driver. 2d accels now work (glClear). Pageflip now works for swapbuffers.	2002-12-30 13:15:55 +00:00
Keith Whitwell	e17d611067	Remove dead code	2002-12-27 13:17:53 +00:00
Keith Whitwell	9df9883a7a	Do a better job of initializing the __DRIdrawablePrivate in driCreateDrawable	2002-12-27 13:07:11 +00:00
Keith Whitwell	22477c050e	Turn off stereo flag in visual configs.	2002-12-27 11:25:08 +00:00
Keith Whitwell	39afeb7cf0	Resolve stability issues starting & stopping radeon driver. Add drmtest program to exercise the drm without the added complications of a full driver. Bring fb driver uptodate with changes for hw drivers.	2002-12-25 12:51:21 +00:00
Keith Whitwell	9363bd862f	missing files	2002-12-23 12:18:14 +00:00
Jose Fonseca	83b936adb3	Better documentation to the data structures of miniglx.h and miniglxP.h. Document the implementation details of most of the public functions in miniglx.c. These details are under the doxygen's \internal tag so their presence in the output documentation is controlled by the INTERNAL_DOCS = YES\|NO variable in the doxygen configurations files.	2002-12-22 17:11:04 +00:00
Jose Fonseca	5134d4a98b	Apply the doxygen treatment to some [big] files. Some enhancements.	2002-12-21 19:06:06 +00:00
Jose Fonseca	2481eda853	Give the doxygen treatment to include/GL/miniglx.h and src/miniglx/miniglxP.h. More documentation fixes and enhancements to src/miniglx/miniglx.c.	2002-12-21 02:47:26 +00:00
Jose Fonseca	6b31afc236	Enable documentation for private and static members. Disable the included file listing.	2002-12-21 02:43:09 +00:00
Jose Fonseca	8fd39b4e8c	Added caller documentation to the remaining public API functions. Renamed some function arguments to match the original Xlib and GLX documentation.	2002-12-20 19:41:41 +00:00
Keith Whitwell	094eed79c2	miniglxtest runs to completion and exits with radeon driver, but produces no graphical output.	2002-12-20 15:07:56 +00:00
Jose Fonseca	d20f1768a6	Added documentation to some functions plus a main page with introduction and references to Mini GLX.	2002-12-20 01:28:15 +00:00
Keith Whitwell	3e06eed70a	Move dri initialization into XCreateWindow	2002-12-19 13:48:27 +00:00
Keith Whitwell	3e13551969	eliminate unresolved symbols	2002-12-19 12:26:15 +00:00
Keith Whitwell	3af2be61fd	Radeon driver and hw init code compiles.	2002-12-19 10:16:18 +00:00
Keith Whitwell	eb7eb6e171	restore some 'drmFree' strings previously clobbered	2002-12-18 15:34:22 +00:00
Keith Whitwell	e931e819f9	Remove references to ScrnInfoPtr	2002-12-18 14:52:58 +00:00
Jose Fonseca	95936ee9ba	Added doxy/miniglx.doxy based on doxy/core.doxy. Fixed typo in doxy/README.	2002-12-18 14:31:51 +00:00
Keith Whitwell	157d9a5ac6	remove some more unused functions	2002-12-16 18:55:42 +00:00
Keith Whitwell	134930b627	remove old comment	2002-12-16 18:38:29 +00:00
Keith Whitwell	a97ce86232	Dumb framebuffer driver now in pretty good shape, though some operations (like swapbuffers) are quite slow because the backbuffer lives in video ram.	2002-12-16 13:40:44 +00:00
Keith Whitwell	5ca95653c4	miniglxtest.c works against swrast driver	2002-12-13 15:18:09 +00:00
Keith Whitwell	1f01a4b3b6	miniglx test will run with fb_dri.so (ie. swrast) driver, but output is garbled.	2002-12-12 14:22:02 +00:00
Keith Whitwell	8645472e00	new files	2002-12-11 14:44:09 +00:00
Keith Whitwell	1929cacdbf	more cleanups	2002-12-11 14:41:20 +00:00
Brian Paul	65e30ac06a	minor tweaks	2002-12-09 22:34:40 +00:00
Brian Paul	941efe8eda	added XGetVisualInfo, glXGetConfig plus misc comments and clean-ups	2002-12-09 22:33:09 +00:00
Keith Whitwell	ea4b887ef7	readded	2002-12-06 16:24:07 +00:00
Keith Whitwell	ba8e63f05b	Get rid of the 'proper' glx files -- glxclient.h, glxext.c Move the interface lines for dri drivers -- the __driUtil functions which know a lot about glx internals now live here.	2002-12-06 16:19:45 +00:00
Keith Whitwell	117a2d76b6	Remove -lX11 from miniglx link libraries...	2002-12-04 16:03:49 +00:00
Keith Whitwell	ce75913702	Caught a couple of things after a clean build on rh 7.3	2002-12-04 16:00:05 +00:00
Keith Whitwell	cbc41d4332	Remove the USE_DRI=0 case -- this is now in drv/fb/fb_dri.c	2002-12-04 15:33:12 +00:00
Keith Whitwell	40af4d7662	A full radeon driver, seems to build ok, haven't run yet	2002-12-04 15:31:04 +00:00
Brian Paul	702b2802a0	added XFree() and glXQueryVersion()	2002-12-04 15:25:37 +00:00
Keith Whitwell	44e4e437a0	new file	2002-12-04 13:09:17 +00:00
Keith Whitwell	366ca58ea6	new makefiles to build modules as .a files	2002-12-04 12:48:09 +00:00
Keith Whitwell	90925c9777	ignore .d files	2002-12-03 22:30:41 +00:00
Brian Paul	f6b40da9a7	* empty log message *	2002-12-03 21:27:54 +00:00
Keith Whitwell	80798c8eab	minor changes from the end of last week	2002-12-03 17:38:19 +00:00
Brian Paul	65a7a3852d	miniglx.c now loads DRI drivers. glxext.c and glxclient.h no longer needed. Many functions in XF86DRI.c are #ifdef'd out and need new implementations.	2002-11-29 16:07:51 +00:00
Brian Paul	cf8aede714	mask is always non-null in write_rgba_pixels and write_monorgba_pixels	2002-11-28 15:55:41 +00:00
Brian Paul	1e27ca69f8	fixed breakage from last check-in, more clean-ups	2002-11-28 00:24:04 +00:00
Brian Paul	9fcd566e60	added DRI awareness (incomplete, disabled by default)	2002-11-28 00:03:07 +00:00
Brian Paul	78b5f5f44f	remove resize() function	2002-11-27 21:04:18 +00:00
Brian Paul	8a82d9db15	support more screen sizes, more clean-ups	2002-11-27 21:03:33 +00:00
Brian Paul	fa747cdb0a	miniglx layered on fbdev works now.	2002-11-27 17:02:39 +00:00
Keith Whitwell	fa50fae202	Narrow down the missing bits of information	2002-11-27 16:31:27 +00:00
Keith Whitwell	0fb48dba7c	pull in more server code, particularly for radeon init	2002-11-27 15:52:13 +00:00
Keith Whitwell	2f3585d4f1	Auto-dependency generating makefile	2002-11-27 13:58:53 +00:00
Brian Paul	7c7789c029	do some simple MMIO register reads for sanity testing	2002-11-27 00:26:59 +00:00
Brian Paul	56ad63958b	set timing values explicitly. new debugging info	2002-11-26 21:20:45 +00:00
Brian Paul	aa0109bf96	move WindowExists() code into glxext.c (effectively out of the driver)	2002-11-26 18:18:54 +00:00
Keith Whitwell	0201db5a22	Added two files which should (with much tweaking) eventually allow the radeon_dri.so driver from the dri project to be loaded and run against an fbdev environment.	2002-11-26 17:39:32 +00:00
Brian Paul	1a1069c7e9	more trimming / hacking	2002-11-25 21:38:08 +00:00
Brian Paul	fc88680a39	more tweaks	2002-11-22 16:13:49 +00:00
Brian Paul	ff89f4b639	fix some bugs, add colormap initialization	2002-11-22 15:26:56 +00:00
Brian Paul	7d5b5c0438	added glfbdevtest and miniglxtest	2002-11-22 00:19:31 +00:00
Brian Paul	6ccaeaaa16	from DRI CVS - hacked to some extent	2002-11-21 16:42:51 +00:00
Brian Paul	e4e72da501	from Mesa 5.1	2002-11-21 16:00:27 +00:00
Brian Paul	67f87d2463	disable thread safety for now	2002-11-21 15:45:55 +00:00
Brian Paul	431c1740d5	compile glfbdev.c and miniglx.c	2002-11-21 14:59:05 +00:00
Brian Paul	fa3f447234	fixed cube texture auto-mipmap generation bug (641363)	2002-11-20 21:40:02 +00:00
Brian Paul	3a08052714	stripped, subsetted DRI-capable libGL	2002-11-20 18:09:51 +00:00
Brian Paul	424096d581	prototype interfaces and tests	2002-11-20 02:10:37 +00:00
Brian Paul	2e5a88ab6a	oops, wrong branch	2002-11-20 02:09:57 +00:00
Brian Paul	d520ff08d0	tests for new interfaces	2002-11-20 01:54:12 +00:00
Brian Paul	ef0e1dcc2e	prototypes for new interfaces	2002-11-20 01:53:24 +00:00
Brian Paul	6412641b19	put FEATURE_NV_vertex_program around vpstate.h include	2002-11-19 15:25:16 +00:00
Brian Paul	3ee066b48f	missed a couple version string updates	2002-11-14 16:16:45 +00:00
Brian Paul	33c0b3e233	patches from Karl	2002-11-13 22:26:23 +00:00
Brian Paul	658145bd82	fix compilation problem (Philippe Houdoin)	2002-11-13 22:21:47 +00:00