util: add u_box_3d
[mesa.git] / Makefile
index eb8dcc1235a0c93b8c856a47057fbc9439f3d1be..c9f612dd27c84647bee6f54a2835241fa19385be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP = .
 
-SUBDIRS = src progs
+SUBDIRS = src
 
 
 default: $(TOP)/configs/current
@@ -48,7 +48,7 @@ install:
        done
 
 
-.PHONY: default doxygen clean realclean distclean install linux-directfb-install
+.PHONY: default doxygen clean realclean distclean install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -80,8 +80,6 @@ catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
-darwin-static \
-darwin-static-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
@@ -111,7 +109,6 @@ linux-alpha-static \
 linux-cell \
 linux-cell-debug \
 linux-debug \
-linux-directfb \
 linux-dri \
 linux-dri-debug \
 linux-dri-x86 \
@@ -121,12 +118,13 @@ linux-dri-xcb \
 linux-egl \
 linux-indirect \
 linux-fbdev \
-linux-glide \
 linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
 linux-llvm \
+linux-llvm-debug \
+linux-opengl-es \
 linux-osmesa \
 linux-osmesa-static \
 linux-osmesa16 \
@@ -135,9 +133,6 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-profile \
-linux-solo \
-linux-solo-x86 \
-linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
@@ -150,7 +145,6 @@ 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 \
@@ -173,22 +167,32 @@ 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 ; \
+       @ if test -f configs/current -o -L configs/current; then \
+               if ! cmp configs/$@ configs/current > /dev/null; then \
+                       echo "Please run 'make realclean' before changing configs" ; \
+                       exit 1 ; \
+               fi ; \
+       else \
+               cd configs && rm -f current && ln -s $@ current ; \
        fi
-       (cd configs && rm -f current && ln -s $@ current)
        $(MAKE) default
 
 
 # Rules for making release tarballs
 
-VERSION=7.7
+VERSION=7.9-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
-DEMO_NAME = MesaDemos-$(VERSION)
 GLUT_NAME = MesaGLUT-$(VERSION)
 
+# This is part of MAIN_FILES
+MAIN_ES_FILES = \
+       $(DIRECTORY)/src/mesa/es/Makefile                               \
+       $(DIRECTORY)/src/mesa/es/sources.mak                            \
+       $(DIRECTORY)/src/mesa/main/*.xml                                \
+       $(DIRECTORY)/src/mesa/main/*.py                                 \
+       $(DIRECTORY)/src/mesa/main/*.dtd
+
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/configure                                          \
@@ -208,8 +212,6 @@ MAIN_FILES = \
        $(DIRECTORY)/docs/RELNOTES*                                     \
        $(DIRECTORY)/docs/*.spec                                        \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
-       $(DIRECTORY)/include/GL/dmesa.h                                 \
-       $(DIRECTORY)/include/GL/ggimesa.h                               \
        $(DIRECTORY)/include/GL/gl.h                                    \
        $(DIRECTORY)/include/GL/glext.h                                 \
        $(DIRECTORY)/include/GL/gl_mangle.h                             \
@@ -220,15 +222,14 @@ MAIN_FILES = \
        $(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                                \
-       $(DIRECTORY)/include/GL/svgamesa.h                              \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
        $(DIRECTORY)/src/glsl/Makefile                                  \
+       $(DIRECTORY)/src/glsl/Makefile.template                         \
+       $(DIRECTORY)/src/glsl/SConscript                                \
        $(DIRECTORY)/src/glsl/*/Makefile                                \
-       $(DIRECTORY)/src/glsl/*/SConscript                              \
        $(DIRECTORY)/src/glsl/*/*.[ch]                                  \
        $(DIRECTORY)/src/Makefile                                       \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
@@ -237,9 +238,9 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/gl.pc.in                                  \
        $(DIRECTORY)/src/mesa/osmesa.pc.in                              \
        $(DIRECTORY)/src/mesa/depend                                    \
+       $(MAIN_ES_FILES)                                                \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
-       $(DIRECTORY)/src/mesa/glapi/*.[chS]                             \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/shader/*.[chly]                           \
@@ -247,9 +248,7 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
        $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
-       $(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                        \
@@ -267,25 +266,13 @@ 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/directfb/*.[ch]                   \
-       $(DIRECTORY)/src/mesa/drivers/directfb/Makefile                 \
-       $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
        $(DIRECTORY)/src/mesa/drivers/fbdev/Makefile                    \
        $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c                   \
-       $(DIRECTORY)/src/mesa/drivers/glide/*.[ch]                      \
-       $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]                        \
-       $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in               \
-       $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c                   \
-       $(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in        \
-       $(DIRECTORY)/src/mesa/drivers/ggi/display/*.c                   \
-       $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in         \
-       $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h          \
        $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile                   \
        $(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/*.[ch]                     \
-       $(DIRECTORY)/src/mesa/drivers/svga/*.[ch]                       \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]                  \
        $(DIRECTORY)/src/mesa/drivers/windows/*/*.def                   \
        $(DIRECTORY)/src/mesa/drivers/x11/Makefile                      \
@@ -301,31 +288,53 @@ MAIN_FILES = \
        $(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)/windows/VC8/
 
-EGL_FILES = \
-       $(DIRECTORY)/include/EGL/*.h                                    \
+MAPI_FILES = \
        $(DIRECTORY)/include/GLES/*.h                                   \
        $(DIRECTORY)/include/GLES2/*.h                                  \
+       $(DIRECTORY)/include/VG/*.h                                     \
+       $(DIRECTORY)/src/mapi/es?api/Makefile                           \
+       $(DIRECTORY)/src/mapi/es?api/*.pc.in                            \
+       $(DIRECTORY)/src/mapi/glapi/gen/Makefile                        \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.xml                           \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.py                            \
+       $(DIRECTORY)/src/mapi/glapi/gen/*.dtd                           \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/Makefile                     \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/*.xml                        \
+       $(DIRECTORY)/src/mapi/glapi/gen-es/*.py                         \
+       $(DIRECTORY)/src/mapi/glapi/Makefile                            \
+       $(DIRECTORY)/src/mapi/glapi/SConscript                          \
+       $(DIRECTORY)/src/mapi/glapi/sources.mak                         \
+       $(DIRECTORY)/src/mapi/glapi/*.[chS]                             \
+       $(DIRECTORY)/src/mapi/mapi/mapi_abi.py                          \
+       $(DIRECTORY)/src/mapi/mapi/sources.mak                          \
+       $(DIRECTORY)/src/mapi/mapi/*.[ch]                               \
+       $(DIRECTORY)/src/mapi/vgapi/Makefile                            \
+       $(DIRECTORY)/src/mapi/vgapi/vgapi.csv                           \
+       $(DIRECTORY)/src/mapi/vgapi/vg.pc.in                            \
+       $(DIRECTORY)/src/mapi/vgapi/*.h
+
+EGL_FILES = \
+       $(DIRECTORY)/include/KHR/*.h                                    \
+       $(DIRECTORY)/include/EGL/*.h                                    \
        $(DIRECTORY)/src/egl/Makefile                                   \
        $(DIRECTORY)/src/egl/*/Makefile                                 \
+       $(DIRECTORY)/src/egl/*/Makefile.template                        \
        $(DIRECTORY)/src/egl/*/*.[ch]                                   \
        $(DIRECTORY)/src/egl/*/*/Makefile                               \
-       $(DIRECTORY)/src/egl/*/*/*.[ch]                                 \
+       $(DIRECTORY)/src/egl/*/*/*.[ch]
 
 GALLIUM_FILES = \
        $(DIRECTORY)/src/mesa/state_tracker/*[ch]                       \
        $(DIRECTORY)/src/gallium/Makefile                               \
        $(DIRECTORY)/src/gallium/Makefile.template                      \
        $(DIRECTORY)/src/gallium/SConscript                             \
+       $(DIRECTORY)/src/gallium/targets/Makefile.dri                   \
+       $(DIRECTORY)/src/gallium/targets/Makefile.egl                   \
        $(DIRECTORY)/src/gallium/*/Makefile                             \
        $(DIRECTORY)/src/gallium/*/SConscript                           \
        $(DIRECTORY)/src/gallium/*/*/Makefile                           \
-       $(DIRECTORY)/src/gallium/*/*/Makefile.template                  \
        $(DIRECTORY)/src/gallium/*/*/SConscript                         \
        $(DIRECTORY)/src/gallium/*/*/*.[ch]                             \
        $(DIRECTORY)/src/gallium/*/*/*.py                               \
@@ -333,9 +342,7 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/*/*/Makefile                         \
        $(DIRECTORY)/src/gallium/*/*/*/SConscript                       \
        $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
-       $(DIRECTORY)/src/gallium/*/*/*/*.py                             \
-       $(DIRECTORY)/src/gallium/*/*/*/*/Makefile                       \
-       $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch]                         \
+       $(DIRECTORY)/src/gallium/*/*/*/*.py
 
 
 DRI_FILES = \
@@ -343,8 +350,8 @@ DRI_FILES = \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
        $(DIRECTORY)/include/GL/internal/sarea.h                        \
        $(DIRECTORY)/src/glx/Makefile                                   \
-       $(DIRECTORY)/src/glx/x11/Makefile                               \
-       $(DIRECTORY)/src/glx/x11/*.[ch]                                 \
+       $(DIRECTORY)/src/glx/Makefile                                   \
+       $(DIRECTORY)/src/glx/*.[ch]                                     \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile                      \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
        $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in                     \
@@ -380,15 +387,6 @@ SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/sgi/libtess/*.[ch]                         \
        $(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*                  \
@@ -405,46 +403,6 @@ GLEW_FILES = \
        $(DIRECTORY)/src/glew/SConscript                \
        $(DIRECTORY)/src/glew/LICENSE.txt
 
-DEMO_FILES = \
-       $(GLEW_FILES)                                   \
-       $(DIRECTORY)/progs/beos/*.cpp                   \
-       $(DIRECTORY)/progs/beos/Makefile                \
-       $(DIRECTORY)/progs/images/*.rgb                 \
-       $(DIRECTORY)/progs/images/*.rgba                \
-       $(DIRECTORY)/progs/demos/Makefile*              \
-       $(DIRECTORY)/progs/demos/descrip.mms            \
-       $(DIRECTORY)/progs/demos/*.[ch]                 \
-       $(DIRECTORY)/progs/demos/*.cxx                  \
-       $(DIRECTORY)/progs/demos/*.dat                  \
-       $(DIRECTORY)/progs/demos/README                 \
-       $(DIRECTORY)/progs/fbdev/Makefile               \
-       $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
-       $(DIRECTORY)/progs/objviewer/*.[ch]             \
-       $(DIRECTORY)/progs/objviewer/*.obj              \
-       $(DIRECTORY)/progs/objviewer/*.mtl              \
-       $(DIRECTORY)/progs/objviewer/*.rgb              \
-       $(DIRECTORY)/progs/objviewer/Makefile           \
-       $(DIRECTORY)/progs/objviewer/README.txt         \
-       $(DIRECTORY)/progs/osdemos/Makefile             \
-       $(DIRECTORY)/progs/osdemos/*.c                  \
-       $(DIRECTORY)/progs/xdemos/Makefile*             \
-       $(DIRECTORY)/progs/xdemos/*.[chf]               \
-       $(DIRECTORY)/progs/redbook/Makefile*            \
-       $(DIRECTORY)/progs/redbook/README               \
-       $(DIRECTORY)/progs/redbook/*.[ch]               \
-       $(DIRECTORY)/progs/samples/Makefile*            \
-       $(DIRECTORY)/progs/samples/README               \
-       $(DIRECTORY)/progs/samples/*.c                  \
-       $(DIRECTORY)/progs/glsl/Makefile*               \
-       $(DIRECTORY)/progs/glsl/*.c                     \
-       $(DIRECTORY)/progs/glsl/*.frag                  \
-       $(DIRECTORY)/progs/glsl/*.vert                  \
-       $(DIRECTORY)/progs/glsl/*.shtest                \
-       $(DIRECTORY)/progs/windml/Makefile.ugl          \
-       $(DIRECTORY)/progs/windml/*.c                   \
-       $(DIRECTORY)/progs/windml/*.bmp                 \
-       $(DIRECTORY)/progs/ggi/*.c
-
 GLUT_FILES = \
        $(DIRECTORY)/include/GL/glut.h                  \
        $(DIRECTORY)/include/GL/glutf90.h               \
@@ -455,22 +413,11 @@ GLUT_FILES = \
        $(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/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/mini/glut.pc.in           \
-       $(DIRECTORY)/src/glut/directfb/Makefile         \
-       $(DIRECTORY)/src/glut/directfb/NOTES            \
-       $(DIRECTORY)/src/glut/directfb/*[ch]
+       $(DIRECTORY)/src/glut/beos/Makefile
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
-       $(TOP)/src/glx/x11/depend       \
+       $(TOP)/src/glx/depend           \
        $(TOP)/src/glw/depend           \
        $(TOP)/src/glut/glx/depend      \
        $(TOP)/src/glu/sgi/depend
@@ -478,6 +425,8 @@ DEPEND_FILES = \
 
 LIB_FILES = \
        $(MAIN_FILES)           \
+       $(MAPI_FILES)           \
+       $(ES_FILES)             \
        $(EGL_FILES)            \
        $(GALLIUM_FILES)        \
        $(DRI_FILES)            \
@@ -486,8 +435,8 @@ LIB_FILES = \
 
 
 # Everything for new a Mesa release:
-tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \
-       lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
+tarballs: rm_depend configure aclocal.m4 lib_gz glut_gz \
+       lib_bz2 glut_bz2 lib_zip glut_zip md5
 
 
 # Helper for autoconf builds
@@ -516,12 +465,6 @@ lib_gz: rm_config
        gzip $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.gz $(DIRECTORY)
 
-demo_gz:
-       cd .. ; \
-       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) ; \
@@ -534,12 +477,6 @@ lib_bz2: rm_config
        bzip2 $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 
-demo_bz2:
-       cd .. ; \
-       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) ; \
@@ -552,12 +489,6 @@ lib_zip: rm_config
        zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
        mv $(LIB_NAME).zip $(DIRECTORY)
 
-demo_zip:
-       rm -f $(DEMO_NAME).zip ; \
-       cd .. ; \
-       zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
-       mv $(DEMO_NAME).zip $(DIRECTORY)
-
 glut_zip:
        rm -f $(GLUT_NAME).zip ; \
        cd .. ; \
@@ -568,14 +499,11 @@ 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
        @-md5sum $(GLUT_NAME).tar.gz
        @-md5sum $(GLUT_NAME).tar.bz2
        @-md5sum $(GLUT_NAME).zip
 
 .PHONY: tarballs rm_depend rm_config md5 \
-       lib_gz demo_gz glut_gz \
-       lib_bz2 demo_bz2 glut_bz2 \
-       lib_zip demo_zip glut_zip
+       lib_gz glut_gz \
+       lib_bz2 glut_bz2 \
+       lib_zip glut_zip