projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mesa: fix some error codes in _mesa_ShaderSourceARB()
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index 9cdbe32288d484cee5182cecb55cdaeb96daf208..9b3be43d5052bf18152a67f63acde14460612eaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,34 +7,45 @@ 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
 
+all: default
+
 
 doxygen:
-       (cd doxygen ; make) ; \
+       cd doxygen && $(MAKE)
+
+.PHONY: doxygen
+
 
 clean:
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; $(MAKE) clean) ; \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) clean) ; \
+               fi \
        done
 
 
 realclean:
-       touch $(TOP)/configs/current
-       $(MAKE) clean
-       -rm -rf lib*
-       -rm -f $(TOP)/configs/current
        -rm -f `find . -name \*.o`
        -rm -f `find . -name \*.a`
        -rm -f `find . -name \*.so`
        -rm -f `find . -name depend`
-
+       -rm -rf lib*
+       $(MAKE) clean
+       -rm -f $(TOP)/configs/current
 
 
 install:
-       @echo "Installing"
-       $(TOP)/bin/installmesa $(DESTDIR)
+       @for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) install) || exit 1 ; \
+               fi \
+       done
+
 
 # DirectFBGL module installation
 linux-directfb-install:
@@ -88,13 +99,16 @@ irix6-o32-static \
 linux \
 linux-alpha \
 linux-alpha-static \
+linux-cell \
 linux-debug \
 linux-directfb \
 linux-dri \
+linux-dri-debug \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
+linux-egl \
 linux-indirect \
 linux-fbdev \
 linux-glide \
@@ -102,11 +116,14 @@ linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
+linux-llvm \
+linux-osmesa \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
+linux-profile \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \
@@ -120,8 +137,10 @@ linux-x86-debug \
 linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
+linux-x86-64-profile \
 linux-x86-64-static \
 linux-x86-glide \
+linux-x86-profile \
 linux-x86-static \
 netbsd \
 openbsd \
@@ -142,34 +161,36 @@ sunos5-v8-static \
 sunos5-v9 \
 sunos5-v9-static \
 ultrix-gcc:
+       @ if [ -e 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.5.1
-LIB_NAME = MesaLib-6.5.1
-DEMO_NAME = MesaDemos-6.5.1
-GLUT_NAME = MesaGLUT-6.5.1
+DIRECTORY = Mesa-7.1pre
+LIB_NAME = MesaLib-7.1pre
+DEMO_NAME = MesaDemos-7.1pre
+GLUT_NAME = MesaGLUT-7.1pre
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/descrip.mms                                        \
        $(DIRECTORY)/mms-config.                                        \
        $(DIRECTORY)/bin/mklib                                          \
-       $(DIRECTORY)/bin/installmesa                                    \
+       $(DIRECTORY)/bin/minstall                                       \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
        $(DIRECTORY)/docs/README.*                                      \
        $(DIRECTORY)/docs/RELNOTES*                                     \
-       $(DIRECTORY)/docs/VERSIONS                                      \
        $(DIRECTORY)/docs/*.spec                                        \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
        $(DIRECTORY)/include/GL/amesa.h                                 \
        $(DIRECTORY)/include/GL/dmesa.h                                 \
-       $(DIRECTORY)/include/GL/directfbgl.h                            \
        $(DIRECTORY)/include/GL/fxmesa.h                                \
        $(DIRECTORY)/include/GL/ggimesa.h                               \
        $(DIRECTORY)/include/GL/gl.h                                    \
@@ -200,25 +221,37 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
+       $(DIRECTORY)/src/mesa/main/sources                              \
        $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
        $(DIRECTORY)/src/mesa/glapi/descrip.mms                         \
-       $(DIRECTORY)/src/mesa/array_cache/*.[ch]                        \
-       $(DIRECTORY)/src/mesa/array_cache/descrip.mms                   \
+       $(DIRECTORY)/src/mesa/glapi/sources                             \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
+       $(DIRECTORY)/src/mesa/math/sources                              \
        $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
        $(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/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                               \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]                         \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
@@ -226,6 +259,7 @@ MAIN_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]                       \
@@ -246,6 +280,7 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]                  \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.def                   \
        $(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]                             \
@@ -262,17 +297,15 @@ 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)/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                \
@@ -293,6 +326,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                                \
@@ -337,6 +371,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*             \
@@ -348,6 +384,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                 \
@@ -374,11 +413,15 @@ GLUT_FILES = \
        $(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)/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