projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed a bug where GenQueriesARB was generating the wrong code for XCB and wouldn...
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index 2f40bef5d74240f931972d5cced7255bd129e268..e8d853dc71f2824434164d80aee8a6a7943699e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,20 @@ realclean:
        $(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`
+
 
 
 install:
        @echo "Installing"
-       $(TOP)/bin/installmesa 
+       $(TOP)/bin/installmesa $(DESTDIR)
+
+# DirectFBGL module installation
+linux-directfb-install:
+       cd src/mesa/drivers/directfb && $(MAKE) install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -45,17 +54,23 @@ $(TOP)/configs/current:
 
 # Rules to set/install a specific build configuration
 aix \
+aix-64 \
 aix-gcc \
 aix-static \
 beos \
 darwin \
 darwin-static \
 freebsd \
+freebsd-dri \
+freebsd-dri-amd64 \
+freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
+hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
+hpux11-64 \
 hpux11-64-static \
 hpux9 \
 hpux9-gcc \
@@ -69,9 +84,12 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-directfb \
 linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
+linux-dri-ppc \
+linux-fbdev \
 linux-glide \
 linux-icc \
 linux-icc-static \
@@ -81,6 +99,7 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
@@ -89,8 +108,11 @@ 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-xcb \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
@@ -111,20 +133,19 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.1
-LIB_NAME = MesaLib-6.1
-DEMO_NAME = MesaDemos-6.1
+DIRECTORY = Mesa-6.3
+LIB_NAME = MesaLib-6.3
+DEMO_NAME = MesaDemos-6.3
 
 LIB_FILES =    \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/descrip.mms                                        \
        $(DIRECTORY)/mms-config.                                        \
-       $(DIRECTORY)/Mesa.dsw                                           \
        $(DIRECTORY)/bin/mklib                                          \
+       $(DIRECTORY)/bin/installmesa                                    \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
-       $(DIRECTORY)/docs/INSTALL.GNU                                   \
        $(DIRECTORY)/docs/README.*                                      \
        $(DIRECTORY)/docs/RELNOTES*                                     \
        $(DIRECTORY)/docs/VERSIONS                                      \
@@ -159,35 +180,35 @@ LIB_FILES =       \
        $(DIRECTORY)/src/mesa/descrip.mms                               \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
-       $(DIRECTORY)/src/mesa/main/main.dsp                             \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
        $(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/math/*.[ch]                               \
-       $(DIRECTORY)/src/mesa/math/math.dsp                             \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
        $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
+       $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
+       $(DIRECTORY)/src/mesa/shader/grammar/*.[ch]                     \
+       $(DIRECTORY)/src/mesa/shader/grammar/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/swrast/*.[ch]                             \
-       $(DIRECTORY)/src/mesa/swrast/swrast.dsp                         \
        $(DIRECTORY)/src/mesa/swrast/descrip.mms                        \
        $(DIRECTORY)/src/mesa/swrast_setup/*.[ch]                       \
-       $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp             \
        $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms                  \
        $(DIRECTORY)/src/mesa/tnl/*.[chS]                               \
-       $(DIRECTORY)/src/mesa/tnl/tnl.dsp                               \
        $(DIRECTORY)/src/mesa/tnl/descrip.mms                           \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]                         \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
        $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
-       $(DIRECTORY)/src/mesa/drivers/beos/*.h                          \
        $(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/dri/common/*.[ch]                 \
        $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c                   \
@@ -203,12 +224,10 @@ 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/*.[ch]                        \
        $(DIRECTORY)/src/mesa/sparc/*.[chS]                             \
@@ -220,9 +239,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/glu/sgi/Makefile                               \
        $(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                            \
@@ -247,16 +264,23 @@ LIB_FILES =       \
        $(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
+       $(DIRECTORY)/vms/xlib_share.opt                                 \
+       $(DIRECTORY)/windows/VC?/mesa/gdi/gdi.dsp                       \
+       $(DIRECTORY)/windows/VC?/mesa/glu/*.txt                         \
+       $(DIRECTORY)/windows/VC?/mesa/glu/glu.dsp                       \
+       $(DIRECTORY)/windows/VC?/mesa/mesa.dsw                          \
+       $(DIRECTORY)/windows/VC?/mesa/mesa/mesa.dsp                     \
+       $(DIRECTORY)/windows/VC?/mesa/osmesa/osmesa.dsp
 
 
-DEMO_FILES =   \
+GLUT_FILES = \
        $(DIRECTORY)/include/GL/glut.h                  \
        $(DIRECTORY)/include/GL/glutf90.h               \
        $(DIRECTORY)/src/glut/glx/Makefile*             \
@@ -264,7 +288,6 @@ DEMO_FILES =        \
        $(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                \
@@ -272,6 +295,11 @@ DEMO_FILES =       \
        $(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
+
+
+DEMO_FILES = \
        $(DIRECTORY)/progs/beos/*.cpp                   \
        $(DIRECTORY)/progs/beos/Makefile                \
        $(DIRECTORY)/progs/images/*.rgb                 \
@@ -282,8 +310,6 @@ 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/xdemos/Makefile*             \
        $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \
@@ -296,7 +322,30 @@ DEMO_FILES =       \
        $(DIRECTORY)/progs/windml/Makefile.ugl          \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \
-       $(DIRECTORY)/progs/ggi/*.c
+       $(DIRECTORY)/progs/ggi/*.c                      \
+       $(DIRECTORY)/windows/VC?/progs/demos/*.dsp      \
+       $(DIRECTORY)/windows/VC?/progs/glut/glut.dsp    \
+       $(DIRECTORY)/windows/VC?/progs/progs.dsw
+
+
+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]
+
+
+# Everything for new a Mesa release:
+tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
 
 
 lib_gz:
@@ -308,7 +357,7 @@ lib_gz:
 
 demo_gz:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
        gzip $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
@@ -321,7 +370,7 @@ lib_bz2:
 
 demo_bz2:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
        bzip2 $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 
@@ -335,7 +384,7 @@ lib_zip:
 demo_zip:
        -rm $(DEMO_NAME).zip ; \
        cd .. ; \
-       zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
+       zip -r $(DEMO_NAME).zip $(DEMO_FILES) $(GLUT_FILES) ; \
        mv $(DEMO_NAME).zip $(DIRECTORY)
 
 md5:
@@ -345,6 +394,3 @@ md5:
        @-md5sum $(DEMO_NAME).tar.gz
        @-md5sum $(DEMO_NAME).tar.bz2
        @-md5sum $(DEMO_NAME).zip
-
-# Everything for new a Mesa release:
-tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5