added a cast
[mesa.git] / Makefile.X11
index 74cac8b0841ca9e695e4cd9f942c860a0103407d..94ef10a7a7a808c3c258a9662fa94c5d02fff939 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: Makefile.X11,v 1.30 2000/07/18 14:31:59 brianp Exp $
+# $Id: Makefile.X11,v 1.76 2003/04/07 14:45:52 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.3
+# Version:  5.1
 # 
-# Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2003  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"),
@@ -42,16 +42,18 @@ default:
        @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 gcc-sl               for a generic system with GCC for shared libs"
        @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"
-       @echo "  make hpux10-sl            for HP systems with HPUX 10.x, 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"
@@ -68,18 +70,14 @@ default:
 
        @echo "  make linux                for Linux systems, make shared .so libs"
        @echo "  make linux-static         for Linux systems, make static .a libs"
-       @echo "  make linux-386            for Linux on Intel, make shared .so libs"
-       @echo "  make linux-386-static     for Linux on Intel, make static .a libs"
+       @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-386-opt-V2-glide  for Linux with 3Dfx Voodoo2 for GLQuake"
-       @echo "  make linux-3dnow          for Linux on AMD w/ 3DNow!"
-       @echo "  make linux-3dnow-glide    for Linux on AMD w/ 3DNow! for Glide"
-       @echo "  make linux-katmai         for Linux on PentiumIII w/ SSE"
-       @echo "  make linux-katmai-glide   for Linux on PentiumIII w/ SSE for Glide"
+       @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"
@@ -87,6 +85,9 @@ default:
        @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)"
@@ -135,17 +136,17 @@ default:
 
 
 
-aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
+# 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 gcc-sl \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
-irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
-linux-static-debug linux-elf-debug linux-prof linux-glide-debug \
-linux linux-static \
-linux-386 linux-386-static \
+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-386-opt-V2-glide \
-linux-3dnow linux-3dnow-glide \
-linux-katmai linux-katmai-glide \
+linux-x86-glide linux-glide-debug linux-glide-prof \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc \
@@ -160,11 +161,11 @@ 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 src-glu  ] ; then touch src-glu/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 src-glu  ] ; then cd src-glu  ; $(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
@@ -172,12 +173,14 @@ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
        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-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
+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 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 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
@@ -188,6 +191,7 @@ irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
 
 irix6-64 irix6-64-dso:
        -mkdir lib64
@@ -204,10 +208,18 @@ irix6-64 irix6-64-dso:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
 
 amiwin:
        bin/mklib.amiwin
 
+# Make an optional library with _just_ core objects
+libmesa:       $(LIBDIR)/$(MESA_LIB)
+       if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
+       if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
+       if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
+
+$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
 
 beos-r4:
        -mkdir lib
@@ -266,14 +278,14 @@ os2-x11:
 linux-ggi linux-386-ggi:
        -mkdir lib
        touch src/depend
-       touch src-glu/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 src-glut ] ; then cd src-glu  ; $(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 ggi ]      ; then cd ggi      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d ggi ]      ; then cd ggi/demos; $(MAKE)                    ; fi
@@ -296,6 +308,12 @@ linux-ggi-install linux-386-ggi-install:
 #      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
@@ -305,6 +323,7 @@ clean:
        -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/*~
@@ -316,234 +335,309 @@ clean:
 
 # Remove everything that can be remade
 realclean: clean
-       -rm -f lib/*
+       -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
-       cd ggi/demos   && $(MAKE) -f Makefile.X11 realclean || true
-       cd src/GGI/default && $(MAKE) -f Makefile.X11 realclean || true
-
-
 
-DIRECTORY = Mesa-3.3
-LIB_NAME = MesaLib-3.3beta1
-DEMO_NAME = MesaDemos-3.3beta1
-GLU_NAME = MesaGLU-3.3beta1
+# Remove everything not in CVS
+cvsclean: realclean
+       -rm -f acinclude.m4 aclocal.m4
+       -rm -f conf.h conf.h.in config.guess config.log config.status
+       -rm -f config.sub configure
+       -rm -f install-sh libtool ltmain.sh Makefile.in
+       -rm -f missing mkinstalldirs stamp-h stamp-h.in
+
+DIRECTORY = Mesa-5.1
+LIB_NAME = MesaLib-5.1
+DEMO_NAME = MesaDemos-5.1
+GLU_NAME = MesaGLU-5.1
 GLUT_NAME = GLUT-3.7
 
+# Make an optional library with _just_ core objects
+libmesa:       $(LIBDIR)/$(MESA_LIB)
+       if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
+       if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
+       if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
+
+$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
 
 LIB_FILES =    \
-       $(DIRECTORY)/Makefile*                  \
-       $(DIRECTORY)/Make-config                \
-       $(DIRECTORY)/acconfig.h                 \
-       $(DIRECTORY)/acinclude.m4               \
-       $(DIRECTORY)/aclocal.m4                 \
-       $(DIRECTORY)/conf.h.in                  \
-       $(DIRECTORY)/config.guess               \
-       $(DIRECTORY)/config.sub                 \
-       $(DIRECTORY)/configure                  \
-       $(DIRECTORY)/configure.in               \
-       $(DIRECTORY)/install-sh                 \
-       $(DIRECTORY)/ltconfig                   \
-       $(DIRECTORY)/ltmain.sh                  \
-       $(DIRECTORY)/missing                    \
-       $(DIRECTORY)/mkinstalldirs              \
-       $(DIRECTORY)/stamp-h.in                 \
-       $(DIRECTORY)/docs/CONFIG                \
-       $(DIRECTORY)/docs/CONFORM               \
-       $(DIRECTORY)/docs/COPYING               \
-       $(DIRECTORY)/docs/COPYRIGHT             \
-       $(DIRECTORY)/docs/DEVINFO               \
-       $(DIRECTORY)/docs/IAFA-PACKAGE          \
-       $(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)/*.BAT                      \
-       $(DIRECTORY)/*.bat                      \
-       $(DIRECTORY)/descrip.mms                \
-       $(DIRECTORY)/mms-config                 \
-       $(DIRECTORY)/xlib.opt                   \
-       $(DIRECTORY)/STARTUP.MK                 \
-       $(DIRECTORY)/mesawin32.mak              \
-       $(DIRECTORY)/Names.win                  \
-       $(DIRECTORY)/win32-openstep.sh          \
-       $(DIRECTORY)/common.dja                 \
-       $(DIRECTORY)/include/GL/Makefile.in     \
-       $(DIRECTORY)/include/GL/Makefile.am     \
-       $(DIRECTORY)/include/GL/dosmesa.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/glx_mangle.h    \
-       $(DIRECTORY)/include/GL/mglmesa.h       \
-       $(DIRECTORY)/include/GL/osmesa.h        \
-       $(DIRECTORY)/include/GL/svgamesa.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/descrip.mms            \
-       $(DIRECTORY)/src/mms_depend             \
-       $(DIRECTORY)/src/mesa.conf              \
-       $(DIRECTORY)/src/*.def                  \
-       $(DIRECTORY)/src/depend                 \
-       $(DIRECTORY)/src/*.[chS]                \
-       $(DIRECTORY)/src/Allegro/*.[ch]         \
-       $(DIRECTORY)/src/BeOS/*.cpp             \
-       $(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/DOS/*.c                \
-       $(DIRECTORY)/src/FX/Makefile.am         \
-       $(DIRECTORY)/src/FX/Makefile.in         \
-       $(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/*.[ch]                          \
-       $(DIRECTORY)/src/S3/*.[ch]                              \
-       $(DIRECTORY)/src/S3/*.def                               \
-       $(DIRECTORY)/src/S3/*.mak                               \
-       $(DIRECTORY)/src/S3/*.rc                                \
-       $(DIRECTORY)/src/SVGA/Makefile.am                       \
-       $(DIRECTORY)/src/SVGA/Makefile.in                       \
-       $(DIRECTORY)/src/SVGA/*.[ch]                            \
-       $(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/*.m4                               \
-       $(DIRECTORY)/src/X86/*.S                                \
-       $(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/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-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                                 \
-       $(DIRECTORY)/WIN32/NMAKE.MAK                            \
-       $(DIRECTORY)/WIN32/NMAKE.MIF                            \
-       $(DIRECTORY)/WIN32/RES/*rc                              \
-       $(DIRECTORY)/WIN32/RES/*def                             \
-       $(DIRECTORY)/WIN32/RULES/lib.*                          \
-       $(DIRECTORY)/WIN32/RULES/progs.*                        \
-       $(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)/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/index.html                                    \
+       $(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/mga/*.[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/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/Makefile.DJ                                 \
+       $(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)/include/GL/glut_h.dja      \
        $(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.dja/*             \
-       $(DIRECTORY)/src-glut.beos/Makefile     \
-       $(DIRECTORY)/src-glut.beos/*.cpp        \
-       $(DIRECTORY)/src-glut.beos/*.h          \
+       $(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          \
@@ -553,7 +647,7 @@ DEMO_FILES =        \
        $(DIRECTORY)/demos/README               \
        $(DIRECTORY)/xdemos/Makefile*           \
        $(DIRECTORY)/xdemos/descrip.mms         \
-       $(DIRECTORY)/xdemos/*.[cf]              \
+       $(DIRECTORY)/xdemos/*.[chf]             \
        $(DIRECTORY)/book/Makefile*             \
        $(DIRECTORY)/book/README                \
        $(DIRECTORY)/book/*.[ch]                \
@@ -561,8 +655,37 @@ DEMO_FILES =       \
        $(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                \
@@ -591,74 +714,84 @@ GLUT_FILES = \
        $(DIRECTORY)/include/GL/glu_mangle.h    \
        $(DIRECTORY)/include/GL/glut.h          \
        $(DIRECTORY)/include/GL/glutf90.h       \
-       $(DIRECTORY)/include/GL/glut_h.dja      \
        $(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/*.[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:
+lib_gz:
        cp Makefile.X11 Makefile ; \
        cd .. ; \
        tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
        gzip $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.gz $(DIRECTORY)
 
-demo_tar:
+demo_gz:
        cd .. ; \
        tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
        gzip $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
-glu_tar:
+lib_bz2:
        cp Makefile.X11 Makefile ; \
        cd .. ; \
-       tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
-       gzip $(GLU_NAME).tar ; \
-       mv $(GLU_NAME).tar.gz $(DIRECTORY)
+       tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+       bzip2 $(LIB_NAME).tar ; \
+       mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 
-glut_tar:
-       cp Makefile.X11 Makefile ; \
+demo_bz2:
        cd .. ; \
-       tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
-       gzip $(GLUT_NAME).tar ; \
-       mv $(GLUT_NAME).tar.gz $(DIRECTORY)
-
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       bzip2 $(DEMO_NAME).tar ; \
+       mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 
 lib_zip:
+       -rm $(LIB_NAME).zip ; \
        cp Makefile.X11 Makefile ; \
-       -rm $(LIB_NAME).zip
        cd .. ; \
        zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
        mv $(LIB_NAME).zip $(DIRECTORY)
 
 demo_zip:
-       -rm $(DEMO_NAME).zip
+       -rm $(DEMO_NAME).zip ; \
        cd .. ; \
        zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
        mv $(DEMO_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
 
+# Everything for new Mesa release:
+tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
 
-SRC_FILES =    \
-       RELNOTES                \
-       src/Makefile*           \
-       src/depend              \
-       src/*.[chS]             \
-       src/*/*.[ch]            \
-       include/GL/*.h
 
-srctar:
-       tar -cvf src.tar $(SRC_FILES) ; \
-       gzip src.tar
+# not used
+glu_gz:
+       cp Makefile.X11 Makefile ; \
+       cd .. ; \
+       tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
+       gzip $(GLU_NAME).tar ; \
+       mv $(GLU_NAME).tar.gz $(DIRECTORY)
 
-srctar.zip:
-       -rm src.zip
-       zip -r src.zip $(SRC_FILES) ; \
+glut_gz:
+       cp Makefile.X11 Makefile ; \
+       cd .. ; \
+       tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+       gzip $(GLUT_NAME).tar ; \
+       mv $(GLUT_NAME).tar.gz $(DIRECTORY)