Tweak the shell scripting for descending into and building subdirs.

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index c99ed53f2181e3198639ef80fa32b9878d7d7727..4984e4dceb76d5cdb9d5d4714a14d5be0619817e 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
 
 
@@ -34,9 +38,12 @@ realclean:
 
 install:
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE) install) || exit 1 ; \
+               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
@@ -155,10 +162,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.5.2
-LIB_NAME = MesaLib-6.5.2
-DEMO_NAME = MesaDemos-6.5.2
-GLUT_NAME = MesaGLUT-6.5.2
+DIRECTORY = Mesa-7.0pre
+LIB_NAME = MesaLib-7.0pre
+DEMO_NAME = MesaDemos-7.0pre
+GLUT_NAME = MesaGLUT-7.0pre
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
@@ -209,9 +216,6 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
        $(DIRECTORY)/src/mesa/glapi/descrip.mms                         \
        $(DIRECTORY)/src/mesa/glapi/sources                             \
-       $(DIRECTORY)/src/mesa/array_cache/*.[ch]                        \
-       $(DIRECTORY)/src/mesa/array_cache/descrip.mms                   \
-       $(DIRECTORY)/src/mesa/array_cache/sources                       \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/math/sources                              \
@@ -225,12 +229,17 @@ MAIN_FILES = \
        $(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/descrip.mms                        \
        $(DIRECTORY)/src/mesa/swrast/sources                            \
        $(DIRECTORY)/src/mesa/swrast_setup/*.[ch]                       \
        $(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/descrip.mms                           \
        $(DIRECTORY)/src/mesa/tnl/sources                               \
@@ -289,7 +298,16 @@ MAIN_FILES = \
        $(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj                    \
        $(DIRECTORY)/windows/VC7/mesa/mesa.sln                          \
        $(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj                  \
-       $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
+       $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj              \
+       $(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                \
@@ -365,6 +383,9 @@ 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                 \