Fix a number of MINGW32 issues

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a45efc76ccbc9632db6eda6e2bbb20715211a28..9a6557571c5029cf477ad2e9d44b41ff46d1cabf 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.3rc3
-LIB_NAME = MesaLib-6.5.3rc3
-DEMO_NAME = MesaDemos-6.5.3rc3
-GLUT_NAME = MesaGLUT-6.5.3rc3
+DIRECTORY = Mesa-7.1pre
+LIB_NAME = MesaLib-7.1pre
+DEMO_NAME = MesaDemos-7.1pre
+GLUT_NAME = MesaGLUT-7.1pre
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
@@ -222,6 +229,9 @@ 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                            \
@@ -278,23 +288,12 @@ MAIN_FILES = \
        $(DIRECTORY)/vms/analyze_map.com                                \
        $(DIRECTORY)/vms/xlib.opt                                       \
        $(DIRECTORY)/vms/xlib_share.opt                                 \
-       $(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/glu/*.txt                         \
-       $(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/mesa.dsw                          \
-       $(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp                     \
-       $(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp                 \
-       $(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj                    \
-       $(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/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)/widnows/VC8/progs/progs.sln                        \
+       $(DIRECTORY)/windows/VC8/progs/progs.sln                        \
        $(DIRECTORY)/windows/VC8/progs/demos/gears.vcproj               \
        $(DIRECTORY)/windows/VC8/progs/glut/glut.vcproj
 
@@ -318,6 +317,7 @@ SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/Makefile                                   \
        $(DIRECTORY)/src/glu/descrip.mms                                \
        $(DIRECTORY)/src/glu/sgi/Makefile                               \
+       $(DIRECTORY)/src/glu/sgi/Makefile.mgw                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.win                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.DJ                            \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
@@ -362,6 +362,8 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
+       $(DIRECTORY)/progs/fbdev/Makefile               \
+       $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
        $(DIRECTORY)/progs/osdemos/Makefile             \
        $(DIRECTORY)/progs/osdemos/*.c                  \
        $(DIRECTORY)/progs/xdemos/Makefile*             \