projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use CSS in custom headers.
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index 64f86275514b216cb3499f99175002a5af3c2c7b..c27e2c9037a78c93b7eb7d19e8e9113b3235c770 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,22 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; make) || exit 1 ; \
+               (cd $$dir ; $(MAKE)) || exit 1 ; \
        done
 
 
+doxygen:
+       (cd doxygen ; make) ; \
+
 clean:
        @for dir in $(SUBDIRS) ; do \
-               (cd $$dir ; make clean) ; \
+               (cd $$dir ; $(MAKE) clean) ; \
        done
 
 
 realclean:
        touch $(TOP)/configs/current
-       make clean
+       $(MAKE) clean
        -rm -rf lib*
        -rm -f $(TOP)/configs/current
 
@@ -43,6 +46,8 @@ $(TOP)/configs/current:
 # Rules to set/install a specific build configuration
 aix \
 aix-gcc \
+aix-static \
+beos \
 darwin \
 darwin-static \
 freebsd \
@@ -76,6 +81,7 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
@@ -101,14 +107,14 @@ sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
        (cd configs && rm -f current && ln -s $@ current)
-       make default
+       $(MAKE) default
 
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.1
-LIB_NAME = MesaLib-6.1
-DEMO_NAME = MesaDemos-6.1
+DIRECTORY = Mesa-6.2
+LIB_NAME = MesaLib-6.2
+DEMO_NAME = MesaDemos-6.2
 
 LIB_FILES =    \
        $(DIRECTORY)/Makefile*                                          \
@@ -116,6 +122,7 @@ LIB_FILES = \
        $(DIRECTORY)/mms-config.                                        \
        $(DIRECTORY)/Mesa.dsw                                           \
        $(DIRECTORY)/bin/mklib                                          \
+       $(DIRECTORY)/bin/installmesa                                    \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
@@ -165,13 +172,16 @@ LIB_FILES =       \
        $(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/shader.dsp                         \
+       $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(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/*.[ch]                                \
+       $(DIRECTORY)/src/mesa/tnl/*.[chS]                               \
        $(DIRECTORY)/src/mesa/tnl/tnl.dsp                               \
        $(DIRECTORY)/src/mesa/tnl/descrip.mms                           \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
@@ -179,6 +189,7 @@ LIB_FILES = \
        $(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/dos/*.[chS]                       \
@@ -240,6 +251,7 @@ 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]                                  \
@@ -259,13 +271,14 @@ DEMO_FILES =      \
        $(DIRECTORY)/src/glut/glx/mms_depend            \
        $(DIRECTORY)/src/glut/glx/glut.dsp              \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
-       $(DIRECTORY)/src/glut/beos/*.h                  \
+       $(DIRECTORY)/src/glut/beos/*.[ch]               \
        $(DIRECTORY)/src/glut/beos/*.cpp                \
-       $(DIRECTORY)/src/glut/beos/libglut.def          \
-       $(DIRECTORY)/src/glut/beos/Makefile*            \
+       $(DIRECTORY)/src/glut/beos/Makefile             \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
        $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
+       $(DIRECTORY)/progs/beos/*.cpp                   \
+       $(DIRECTORY)/progs/beos/Makefile                \
        $(DIRECTORY)/progs/images/*.rgb                 \
        $(DIRECTORY)/progs/images/*.rgba                \
        $(DIRECTORY)/progs/demos/Makefile*              \
@@ -291,6 +304,26 @@ DEMO_FILES =       \
        $(DIRECTORY)/progs/ggi/*.c
 
 
+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:
        rm -f configs/current ; \
        cd .. ; \
@@ -337,6 +370,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