[INTEL] Fix 965 to use new centralized mipmap pitch function
[mesa.git] / Makefile
index 495ebbbdcb7b730123d3593ca8bf50765e3f86d8..ac1e94ee8629219cc08bf5c36550aebfab851d57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,9 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE)) || exit 1 ; \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE)) || exit 1 ; \
+               fi \
        done
 
 
@@ -16,7 +18,9 @@ doxygen:
 
 clean:
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE) clean) ; \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) clean) ; \
+               fi \
        done
 
 
@@ -28,12 +32,21 @@ realclean:
        -rm -f `find . -name \*.o`
        -rm -f `find . -name \*.a`
        -rm -f `find . -name \*.so`
+       -rm -f `find . -name depend`
 
 
 
 install:
-       @echo "Installing"
-       $(TOP)/bin/installmesa 
+       @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
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -50,13 +63,20 @@ $(TOP)/configs/current:
 # Rules to set/install a specific build configuration
 aix \
 aix-64 \
+aix-64-static \
 aix-gcc \
 aix-static \
+bluegene-osmesa \
+bluegene-xlc-osmesa \
 beos \
+catamount-osmesa-pgi \
 darwin \
 darwin-static \
+darwin-static-x86ppc \
+darwin-x86ppc \
 freebsd \
 freebsd-dri \
+freebsd-dri-amd64 \
 freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
@@ -66,6 +86,8 @@ hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64 \
 hpux11-64-static \
+hpux11-ia64 \
+hpux11-ia64-static \
 hpux9 \
 hpux9-gcc \
 irix6-64 \
@@ -78,13 +100,21 @@ 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 \
@@ -100,50 +130,62 @@ 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
 
-DIRECTORY = Mesa-6.2
-LIB_NAME = MesaLib-6.2
-DEMO_NAME = MesaDemos-6.2
+DIRECTORY = Mesa-7.1pre
+LIB_NAME = MesaLib-7.1pre
+DEMO_NAME = MesaDemos-7.1pre
+GLUT_NAME = MesaGLUT-7.1pre
 
-LIB_FILES =    \
+MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/descrip.mms                                        \
        $(DIRECTORY)/mms-config.                                        \
-       $(DIRECTORY)/Mesa.dsw                                           \
        $(DIRECTORY)/bin/mklib                                          \
-       $(DIRECTORY)/bin/installmesa                                    \
+       $(DIRECTORY)/bin/minstall                                       \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
-       $(DIRECTORY)/docs/INSTALL.GNU                                   \
        $(DIRECTORY)/docs/README.*                                      \
        $(DIRECTORY)/docs/RELNOTES*                                     \
-       $(DIRECTORY)/docs/VERSIONS                                      \
        $(DIRECTORY)/docs/*.spec                                        \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
-       $(DIRECTORY)/include/GL/dmesa.h                                 \
        $(DIRECTORY)/include/GL/amesa.h                                 \
+       $(DIRECTORY)/include/GL/dmesa.h                                 \
        $(DIRECTORY)/include/GL/fxmesa.h                                \
        $(DIRECTORY)/include/GL/ggimesa.h                               \
        $(DIRECTORY)/include/GL/gl.h                                    \
@@ -154,6 +196,7 @@ LIB_FILES = \
        $(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                                \
@@ -164,36 +207,47 @@ LIB_FILES =       \
        $(DIRECTORY)/include/GL/xmesa.h                                 \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
        $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
+       $(DIRECTORY)/include/GLView.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/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
-       $(DIRECTORY)/src/mesa/main/main.dsp                             \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
+       $(DIRECTORY)/src/mesa/main/sources                              \
        $(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/glapi/sources                             \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
-       $(DIRECTORY)/src/mesa/math/math.dsp                             \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
+       $(DIRECTORY)/src/mesa/math/sources                              \
        $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
-       $(DIRECTORY)/src/mesa/shader/shader.dsp                         \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
+       $(DIRECTORY)/src/mesa/shader/sources                            \
+       $(DIRECTORY)/src/mesa/shader/grammar/*.[ch]                     \
+       $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms                \
+       $(DIRECTORY)/src/mesa/shader/grammar/sources                    \
+       $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
+       $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
+       $(DIRECTORY)/src/mesa/shader/slang/sources                      \
+       $(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/swrast.dsp                         \
        $(DIRECTORY)/src/mesa/swrast/descrip.mms                        \
+       $(DIRECTORY)/src/mesa/swrast/sources                            \
        $(DIRECTORY)/src/mesa/swrast_setup/*.[ch]                       \
-       $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp             \
        $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms                  \
+       $(DIRECTORY)/src/mesa/swrast_setup/sources                      \
+       $(DIRECTORY)/src/mesa/vbo/*.[chS]                               \
+       $(DIRECTORY)/src/mesa/vbo/descrip.mms                           \
        $(DIRECTORY)/src/mesa/tnl/*.[chS]                               \
-       $(DIRECTORY)/src/mesa/tnl/tnl.dsp                               \
        $(DIRECTORY)/src/mesa/tnl/descrip.mms                           \
+       $(DIRECTORY)/src/mesa/tnl/sources                               \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]                         \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
@@ -201,11 +255,12 @@ LIB_FILES =       \
        $(DIRECTORY)/src/mesa/drivers/beos/Makefile                     \
        $(DIRECTORY)/src/mesa/drivers/common/*.[ch]                     \
        $(DIRECTORY)/src/mesa/drivers/common/descrip.mms                \
+       $(DIRECTORY)/src/mesa/drivers/common/sources                    \
+       $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]                   \
+       $(DIRECTORY)/src/mesa/drivers/directfb/Makefile                 \
        $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
-       $(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]                        \
        $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in               \
        $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c                   \
@@ -216,26 +271,62 @@ LIB_FILES =       \
        $(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/sources                       \
        $(DIRECTORY)/src/mesa/drivers/x11/*.[ch]                        \
+       $(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/mesa/mesa.sln                          \
+       $(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj                    \
+       $(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj                    \
+       $(DIRECTORY)/windows/VC8/mesa/mesa/mesa.vcproj                  \
+       $(DIRECTORY)/windows/VC8/mesa/osmesa/osmesa.vcproj              \
+       $(DIRECTORY)/windows/VC8/progs/progs.sln                        \
+       $(DIRECTORY)/windows/VC8/progs/demos/gears.vcproj               \
+       $(DIRECTORY)/windows/VC8/progs/glut/glut.vcproj
+
+
+DRI_FILES = \
+       $(DIRECTORY)/include/GL/internal/dri_interface.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/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/cc*.txt                                \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
-       $(DIRECTORY)/src/glu/sgi/glu.dsp                                \
        $(DIRECTORY)/src/glu/sgi/dummy.cc                               \
        $(DIRECTORY)/src/glu/sgi/descrip.mms                            \
        $(DIRECTORY)/src/glu/sgi/mesaglu.opt                            \
@@ -249,45 +340,25 @@ LIB_FILES =       \
        $(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]                         \
-       $(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]                                \
-       $(DIRECTORY)/src/glw/*.[ch]                                     \
-       $(DIRECTORY)/src/glw/Makefile*                                  \
-       $(DIRECTORY)/src/glw/README                                     \
-       $(DIRECTORY)/src/glw/depend                                     \
-       $(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
-
-
-DEMO_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/*def                  \
-       $(DIRECTORY)/src/glut/glx/descrip.mms           \
-       $(DIRECTORY)/src/glut/glx/mms_depend            \
-       $(DIRECTORY)/src/glut/glx/glut.dsp              \
-       $(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/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                 \
@@ -298,8 +369,10 @@ DEMO_FILES =       \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
-       $(DIRECTORY)/progs/demos/Windows/*.dsp          \
-       $(DIRECTORY)/progs/demos/Windows/*.dsw          \
+       $(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]               \
@@ -309,71 +382,123 @@ DEMO_FILES =     \
        $(DIRECTORY)/progs/samples/Makefile*            \
        $(DIRECTORY)/progs/samples/README               \
        $(DIRECTORY)/progs/samples/*.c                  \
+       $(DIRECTORY)/progs/glsl/Makefile*               \
+       $(DIRECTORY)/progs/glsl/*.c                     \
+       $(DIRECTORY)/progs/glsl/*.txt                   \
        $(DIRECTORY)/progs/windml/Makefile.ugl          \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \
-       $(DIRECTORY)/progs/ggi/*.c
+       $(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/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
 
-DRI_FILES = \
-       $(DIRECTORY)/src/glx/Makefile                                   \
-       $(DIRECTORY)/src/glx/mini/*.[ch]                                \
-       $(DIRECTORY)/src/glx/mini/example.miniglx.conf                  \
-       $(DIRECTORY)/src/glx/mini/NOTES                                 \
-       $(DIRECTORY)/src/mesa/drivers/dri/Makefile                      \
-       $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
-       $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]                 \
-       $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h        \
-       $(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch]                      \
-       $(DIRECTORY)/src/mesa/drivers/dri/*/depend                      \
-       $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile                    \
-       $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile                    \
-       $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
+
+LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
 
 
 # Everything for new a Mesa release:
-tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
+tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
+
 
+rm_depend:
+       @for dep in $(DEPEND_FILES) ; do \
+               rm -f $$dep ; \
+               touch $$dep ; \
+       done
 
 lib_gz:
        rm -f configs/current ; \
        cd .. ; \
-       tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+       tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
        gzip $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.gz $(DIRECTORY)
 
 demo_gz:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       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 ; \
        cd .. ; \
-       tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+       tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
        bzip2 $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 
 demo_bz2:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       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 $(LIB_NAME).zip ; \
+       rm -f $(LIB_NAME).zip ; \
        cd .. ; \
-       zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
+       zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
        mv $(LIB_NAME).zip $(DIRECTORY)
 
 demo_zip:
-       -rm $(DEMO_NAME).zip ; \
+       rm -f $(DEMO_NAME).zip ; \
        cd .. ; \
-       zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
+       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
@@ -381,3 +506,6 @@ md5:
        @-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