fix glXChooseFBConfig bug 890167
[mesa.git] / Makefile.X11
index 121bbf26d8dc0ce46649210567974cc02d3ea285..b5ec4be2261e7d85dfa33c37f704ff47c97d23b9 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: Makefile.X11,v 1.93 2003/10/16 19:30:22 brianp Exp $
+# $Id: Makefile.X11,v 1.113 2004/01/30 23:32:19 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  5.1
+# Version:  6.1
 # 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2004  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"),
@@ -33,8 +33,9 @@ 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 aix                   for AIX systems with xlc"
+       @echo "  make aix-sl                for AIX systems, make shared libs"
+       @echo "  make aix-gcc               for AIX sytems with gcc"
        @echo "  make beos-r4               for BeOS R4"
        @echo "  make cygnus                for Win95/NT using Cygnus-Win32"
        @echo "  make cygnus-linux          for Win95/NT using Cygnus-Win32 under Linux"
@@ -74,7 +75,7 @@ default:
        @echo "  make linux-osmesa16        for 16-bit/channel OSMesa"
        @echo "  make linux-osmesa16-static for 16-bit/channel OSMesa, make static libs"
        @echo "  make linux-osmesa32        for 32-bit/channel OSMesa"
-       @echo "  make linux-solo            for Linux standalone with dri drivers"
+       @echo "  make linux-solo            for Linux standalone with DRI drivers"
        @echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
        @echo "  make lynxos                for LynxOS systems with GCC"
        @echo "  make mklinux               for Linux on Power Macintosh"
@@ -92,6 +93,7 @@ default:
        @echo "  make sunos5                for Suns with SunOS 5.x"
        @echo "  make sunos5-smp            for Suns with SunOS 5.x, SMP optimization"
        @echo "  make sunos5-gcc            for Suns with SunOS 5.x and GCC"
+       @echo "  make sunos5-gcc-debug      for Suns with SunOS 5.x and GCC"
        @echo "  make ultrix-gcc            for DEC systems with Ultrix and GCC"
        @echo "  make unixware              for PCs running UnixWare"
        @echo "  make unixware-shared       for PCs running UnixWare, shared libs"
@@ -103,7 +105,8 @@ default:
 # 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 darwin freebsd freebsd-386 gcc-sl \
+aix aix-sl aix-gcc darwin freebsd freebsd-386 gcc-sl \
+cygnus cygnus-linux \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 linux linux-debug \
@@ -115,102 +118,228 @@ linux-sparc linux-sparc5 linux-sparc-ultra \
 mklinux netbsd osf1 openbsd qnx \
 solaris-x86 solaris-x86-gcc \
 sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
-sunos5 sunos5-smp sunos5-gcc \
+sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
 ultrix-gcc unixware:
        -mkdir lib
-       if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
-       if [ -d src/glu/sgi  ] ; then touch src/glu/sgi/depend  ; fi
-       if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
-       if [ -d src/glw      ] ; then touch src/glw/depend      ; fi
-       if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/glx  ] ; then cd src/glut/glx  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glw       ] ; then cd src/glw       ; $(MAKE) -f Makefile.X11 $@ ; fi
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glut/glx ] ; then \
+               cd src/glut/glx ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glw ] ; then \
+               cd src/glw ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/demos ] ; then \
+               cd progs/demos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/xdemos ] ; then \
+               cd progs/xdemos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/samples ] ; then \
+               cd progs/samples ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/redbook ] ; then \
+               cd progs/redbook ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+
 
 gcc-mesa-sl:
        if [ -d src ] ; then cd src  ; $(MAKE) -f Makefile.X11 $@ ; fi
 
+
 irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
        -mkdir lib32
-       if [ -d src/mesa      ] ; then touch src/mesa/depend      ; fi
-       if [ -d src/glu/sgi   ] ; then touch src/glu/sgi/depend   ; fi
-       if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
-       if [ -d src/glw ] ; then touch src/glw/depend ; fi
-       if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos    ] ; then cd progs/demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos   ] ; then cd progs/xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/samples  ] ; then cd progs/samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/redbook     ] ; then cd progs/redbook     ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glut/glx ] ; then \
+               cd src/glut/glx ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glw ] ; then \
+               cd src/glw ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/demos ] ; then \
+               cd progs/demos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/xdemos ] ; then \
+               cd progs/xdemos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/samples ] ; then \
+               cd progs/samples ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/redbook ] ; then \
+               cd progs/redbook ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
 
 irix6-64 irix6-64-dso:
        -mkdir lib64
-       if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
-       if [ -d src/glu/sgi  ] ; then touch src/glu/sgi/depend  ; fi
-       if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
-       if [ -d src/glw      ] ; then touch src/glw/depend      ; fi
-       if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/glx  ] ; then cd src/glut/glx  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
-
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glut/glx ] ; then \
+               cd src/glut/glx ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glw ] ; then \
+               cd src/glw ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/demos ] ; then \
+               cd progs/demos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/xdemos ] ; then \
+               cd progs/xdemos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/samples ] ; then \
+               cd progs/samples ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/redbook ] ; then \
+               cd progs/redbook ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+
+irix6-mgl-n32-dso:
+       -mkdir libMGL32
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
 
 beos-r4:
        -mkdir lib
-       -rm src/mesa/depend
-       touch src/mesa/depend
-       -rm src/glu/sgi/depend
-       touch src/glu/sgi/depend
-       if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-       if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-       if [ -d src/glut/beos ] ; then cd src/glut/beos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-       if [ -d src/glut/beos ] ; then cp src/glut/beos/obj*/libglut.so lib  ; fi
-       if [ -d progs/beos    ] ; then cd progs/beos    ; $(MAKE)                        ; fi
-       if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-       if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-       if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-
-cygnus cygnus-linux:
-       -mkdir lib
-       touch src/depend
-       touch src-glu/depend
-       if [ -d src/mesa     ] ; then cd src/mesa     ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/sgi  ] ; then cd src/glu/sgi  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos  ] ; then cd progs/demos  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glw      ] ; then cd src/glw      ; $(MAKE) -f Makefile.X11 $@ ; fi
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               -rm depend ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               -rm depend ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+       fi
+       if [ -d src/glut/beos ] ; then \
+               cd src/glut/beos ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+               cp obj*/libglut.so ../../../lib ; \
+       fi
+       if [ -d progs/beos ] ; then \
+               cd progs/beos ; \
+               $(MAKE) ; \
+       fi
+       if [ -d progs/demos ] ; then \
+               cd progs/demos ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+       fi
+       if [ -d progs/samples ] ; then \
+               cd progs/samples ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+       fi
+       if [ -d progs/redbook ] ; then \
+               cd progs/redbook ; \
+               $(MAKE) -f Makefile.BeOS-R4 $@ ; \
+       fi
+
 
 openstep:
        -mkdir lib
        cd src/mesa    ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
        cd src/glu/sgi ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 
+
 linux-ggi linux-x86-ggi:
        -mkdir lib
-       touch src/depend
-       touch src/glu/sgi/depend
-       if [ -d src/glut/glx    ] ; then touch src/glut/glx/depend ; fi
-       if [ -d src/glw         ] ; then touch src/glw/depend ; fi
-       if [ -d src/mesa        ] ; then cd src            ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/sgi     ] ; then cd src/glu/sgi    ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/glx    ] ; then cd src/glut/glx   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d ggi/demos       ] ; then cd ggi/demos      ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos     ] ; then cd progs/demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos    ] ; then cd progs/xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/samples   ] ; then cd progs/samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/redbook   ] ; then cd progs/redbook  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glut/glx ] ; then \
+               cd src/glut/glx ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d src/glw ] ; then \
+               cd src/glw ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/demos ] ; then \
+               cd progs/demos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/xdemos ] ; then \
+               cd progs/xdemos ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/samples ] ; then \
+               cd progs/samples ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/redbook ] ; then \
+               cd progs/redbook ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+       if [ -d progs/ggi ] ; then \
+               cd progs/ggi ; \
+               $(MAKE) -f Makefile.X11 $@ ; \
+       fi
+
 
 # if you change GGI_DEST please change it in ggimesa.conf, too.
 DESTDIR=/usr/local
@@ -225,72 +354,91 @@ linux-ggi-install linux-x86-ggi-install:
 #      echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #      fi
 
+
 linux-osmesa16 linux-osmesa16-static linux-osmesa32:
        -mkdir lib
-       if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
-       if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
+       if [ -d src/mesa ] ; then \
+               cd src/mesa ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.OSMesa16 $@ ; \
+       fi
+
 
+# Stand-alone DRI hardware drivers
 linux-solo:
        -mkdir lib
-       if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
-       if [ -d src/glx/mini ] ; then touch src/glx/mini/depend  ; fi
-       if [ -d src/glu/mini ] ; then touch src/glu/mini/depend  ; fi
-       if [ -d src/glut/mini ] ; then touch src/glut/mini/depend  ; fi
-       if [ -d src/mesa/drivers/dri/r200 ] ; then touch src/mesa/drivers/dri/r200/depend ; fi
-       if [ -d src/mesa/drivers/dri/r128 ] ; then touch src/mesa/drivers/dri/r128/depend ; fi
-       if [ -d src/mesa/drivers/dri/radeon ] ; then touch src/mesa/drivers/dri/radeon/depend ; fi
-       if [ -d src/mesa/drivers/dri/mga ] ; then touch src/mesa/drivers/dri/mga/depend ; fi
-       if [ -d src/mesa/drivers/dri/i810 ] ; then touch src/mesa/drivers/dri/i810/depend ; fi
-       if [ -d src/mesa/drivers/dri/i830 ] ; then touch src/mesa/drivers/dri/i830/depend ; fi
-       if [ -d src/mesa/drivers/dri/sis ] ; then touch src/mesa/drivers/dri/sis/depend ; fi
-       if [ -d src/mesa/drivers/dri/gamma ] ; then touch src/mesa/drivers/dri/gamma/depend ; fi
-       if [ -d src/mesa/drivers/dri/fb ] ; then touch src/mesa/drivers/dri/fb/depend ; fi
-       if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
-       if [ -d progs/miniglx ] ; then touch progs/miniglx/depend ; fi
-       if [ -d progs/tests ] ; then touch progs/tests/depend ; fi
-       if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/r200 ] ; then cd src/mesa/drivers/dri/r200     ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/r128 ] ; then cd src/mesa/drivers/dri/r128     ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/radeon ] ; then cd src/mesa/drivers/dri/radeon ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/mga ] ; then cd src/mesa/drivers/dri/mga       ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/i810 ] ; then cd src/mesa/drivers/dri/i810       ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/i830 ] ; then cd src/mesa/drivers/dri/i830       ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/sis ] ; then cd src/mesa/drivers/dri/sis       ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/gamma ] ; then cd src/mesa/drivers/dri/gamma       ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/mesa/drivers/dri/fb ] ; then cd src/mesa/drivers/dri/fb         ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glx/mini  ] ; then cd src/glx/mini  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glu/mini  ] ; then cd src/glu/mini  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d src/glut/mini ] ; then cd src/glut/mini ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/miniglx ] ; then cd progs/miniglx ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/tests   ] ; then cd progs/tests   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
-       if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
+       cd src/mesa                    ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/r200   ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/radeon ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/r128   ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/mga    ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/i810   ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/i830   ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/sis    ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/gamma  ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/tdfx   ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/fb     ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/mesa/drivers/dri/unichrome ; touch depend ; $(MAKE) -f Makefile.solo $@
+       cd src/glx/mini                ; touch depend ; $(MAKE) -f Makefile.solo $@
+       if [ -d src/glu/sgi ] ; then \
+               cd src/glu/sgi ; \
+               touch depend ; \
+               ln -s Makefile.X11 Makefile.solo ; \
+               $(MAKE) -f Makefile.solo $@ ; \
+       fi
+       if [ -d src/glut/mini ] ; then \
+               cd src/glut/mini ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.solo $@ ; \
+       fi
+       if [ -d progs/miniglx ] ; then \
+               cd progs/miniglx ; \
+               touch depend ; \
+               $(MAKE) -f Makefile.solo $@ ; \
+       fi
+#      if [ -d progs/demos ] ; then \
+#              cd progs/demos ; \
+#              $(MAKE) -f Makefile.X11 $@ ; \
+#      fi
+#      if [ -d progs/xdemos ] ; then \
+#              cd progs/xdemos ; \
+#              $(MAKE) -f Makefile.X11 $@ ; \
+#      fi
+#      if [ -d progs/samples ] ; then \
+#              cd progs/samples ; \
+#              $(MAKE) -f Makefile.X11 $@ ; \
+#      fi
+#      if [ -d progs/redbook ] ; then \
+#              cd progs/redbook ; \
+#              $(MAKE) -f Makefile.X11 $@ ; \
+#      fi
+
 
 # Remove .o files, emacs backup files, etc.
+# XXX this should be cleaned up
 clean:
-       if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
-       if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
-       if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
-       if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
-       if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
-       if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
-       if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
-       if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
-       if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
-       if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
-       if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
-       if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
-       if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
-       if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
+#      if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
+#      if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
+#      if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
+#      if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
+#      if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
+#      if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
+#      if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
+#      if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
+#      if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
+#      if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
+#      if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
+#      if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
+#      if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
+#      if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
        -rm -f include/GL/*~
        cd src/mesa          && $(MAKE) -f Makefile.X11 $@ || true
-       cd src/mesa/drivers/dri/r200   && $(MAKE) -f Makefile.X11 $@ || true
-       cd src/mesa/drivers/dri/r128   && $(MAKE) -f Makefile.X11 $@ || true
-       cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.X11 $@ || true
-       cd src/mesa/drivers/dri/mga    && $(MAKE) -f Makefile.X11 $@ || true
-       cd src/mesa/drivers/dri/fb     && $(MAKE) -f Makefile.X11 $@ || true
+       cd src/mesa/drivers/dri/r200   && $(MAKE) -f Makefile.solo $@ || true
+       cd src/mesa/drivers/dri/r128   && $(MAKE) -f Makefile.solo $@ || true
+       cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.solo $@ || true
+       cd src/mesa/drivers/dri/mga    && $(MAKE) -f Makefile.solo $@ || true
+       cd src/mesa/drivers/dri/fb     && $(MAKE) -f Makefile.solo $@ || true
+       cd src/mesa/drivers/dri/unichrome && $(MAKE) -f Makefile.solo $@ || true
        cd src/glu/mesa      && $(MAKE) -f Makefile.X11 $@ || true
        cd src/glu/sgi       && $(MAKE) -f Makefile.X11 $@ || true
        cd src/glu/mini      && $(MAKE) -f Makefile.X11 $@ || true
@@ -303,21 +451,22 @@ clean:
        cd progs/xdemos      && $(MAKE) -f Makefile.X11 $@ || true
        cd progs/samples     && $(MAKE) -f Makefile.X11 $@ || true
        cd progs/tests       && $(MAKE) -f Makefile.X11 $@ || true
-       cd progs/miniglx     && $(MAKE) -f Makefile.X11 $@ || true
-       if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
-       if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
-       if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
-       if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
-       if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
-       if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
-       if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
-       if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
-       if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
-       if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
-       if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
-       if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
-       if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
-       if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
+       cd progs/miniglx     && $(MAKE) -f Makefile.solo $@ || true
+#      if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
+#      if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
+#      if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
+#      if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
+#      if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
+#      if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
+#      if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
+#      if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
+#      if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
+#      if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
+#      if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
+#      if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
+#      if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
+#      if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
+
 
 # Remove everything that can be remade
 realclean: clean
@@ -327,6 +476,7 @@ realclean: clean
        cd progs/redbook     && $(MAKE) -f Makefile.X11 realclean || true
        cd progs/samples     && $(MAKE) -f Makefile.X11 realclean || true
 
+
 # Remove everything not in CVS
 cvsclean: realclean
        -rm -f acinclude.m4 aclocal.m4
@@ -338,10 +488,10 @@ cvsclean: realclean
 
 
 
-DIRECTORY = Mesa-5.1
-LIB_NAME = MesaLib-5.1
-DEMO_NAME = MesaDemos-5.1
-GLU_NAME = MesaGLU-5.1
+DIRECTORY = Mesa-6.1
+LIB_NAME = MesaLib-6.1
+DEMO_NAME = MesaDemos-6.1
+GLU_NAME = MesaGLU-6.1
 GLUT_NAME = GLUT-3.7
 
 
@@ -382,28 +532,42 @@ LIB_FILES =       \
        $(DIRECTORY)/include/GL/xmesa.h                                 \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
        $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
+       $(DIRECTORY)/src/descrip.mms                                    \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
+       $(DIRECTORY)/src/mesa/sources                                   \
        $(DIRECTORY)/src/mesa/descrip.mms                               \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
+       $(DIRECTORY)/src/mesa/main/main.dsp                             \
+       $(DIRECTORY)/src/mesa/main/descrip.mms                          \
        $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
+       $(DIRECTORY)/src/mesa/glapi/glapi.dsp                           \
+       $(DIRECTORY)/src/mesa/glapi/descrip.mms                         \
        $(DIRECTORY)/src/mesa/array_cache/*.[ch]                        \
        $(DIRECTORY)/src/mesa/array_cache/array_cache.dsp               \
+       $(DIRECTORY)/src/mesa/array_cache/descrip.mms                   \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/math.dsp                             \
+       $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/swrast/*.[ch]                             \
        $(DIRECTORY)/src/mesa/swrast/swrast.dsp                         \
+       $(DIRECTORY)/src/mesa/swrast/descrip.mms                        \
        $(DIRECTORY)/src/mesa/swrast_setup/*.[ch]                       \
        $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp             \
+       $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms                  \
        $(DIRECTORY)/src/mesa/tnl/*.[ch]                                \
        $(DIRECTORY)/src/mesa/tnl/tnl.dsp                               \
+       $(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/beos/*.cpp                        \
+       $(DIRECTORY)/src/mesa/drivers/beos/*.h                          \
        $(DIRECTORY)/src/mesa/drivers/common/*.[ch]                     \
+       $(DIRECTORY)/src/mesa/drivers/common/descrip.mms                \
        $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
-       $(DIRECTORY)/src/mesa/drivers/dos/mga/*.[ch]                    \
-       $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
+       $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]                 \
+       $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c                   \
        $(DIRECTORY)/src/mesa/drivers/glide/*.[ch]                      \
        $(DIRECTORY)/src/mesa/drivers/glide/*.def                       \
        $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]                        \
@@ -414,18 +578,24 @@ LIB_FILES =       \
        $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in         \
        $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h          \
        $(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/osmesa.dsp                 \
        $(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/windows/*/*.dsp                   \
+       $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms                   \
        $(DIRECTORY)/src/mesa/drivers/x11/*.[ch]                        \
        $(DIRECTORY)/src/mesa/sparc/*.[chS]                             \
        $(DIRECTORY)/src/mesa/x86/*.[ch]                                \
        $(DIRECTORY)/src/mesa/x86/*.S                                   \
+       $(DIRECTORY)/src/glu/descrip.mms                                \
        $(DIRECTORY)/src/glu/sgi/Makefile.X11                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.win                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.DJ                            \
+       $(DIRECTORY)/src/glu/sgi/cc*.txt                                \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
        $(DIRECTORY)/src/glu/sgi/glu.dsp                                \
        $(DIRECTORY)/src/glu/sgi/dummy.cc                               \
@@ -470,16 +640,23 @@ DEMO_FILES =      \
        $(DIRECTORY)/src/glut/glx/mms_depend            \
        $(DIRECTORY)/src/glut/glx/glut.dsp              \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
+       $(DIRECTORY)/src/glut/beos/*.h                  \
+       $(DIRECTORY)/src/glut/beos/*.cpp                \
+       $(DIRECTORY)/src/glut/beos/libglut.def          \
+       $(DIRECTORY)/src/glut/beos/Makefile*            \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
        $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
-       $(DIRECTORY)/progs/images/*                     \
+       $(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/demos/Windows/*.dsp          \
+       $(DIRECTORY)/progs/demos/Windows/*.dsw          \
        $(DIRECTORY)/progs/xdemos/Makefile*             \
        $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \