updated tests for defining __FUNCTION__ (Dan Schikore)

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index d7d5857aa1bdce945310ba530e4f63c602377184..12ba21986ad1f03115942dabd76fb6174165ec61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,7 @@ linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
+linux-dri-xcb \
 linux-indirect \
 linux-fbdev \
 linux-glide \
@@ -113,7 +114,6 @@ linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
 linux-x86-64-static \
-linux-x86-xcb \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
@@ -126,6 +126,7 @@ sunos4-gcc \
 sunos4-static \
 sunos5 \
 sunos5-gcc \
+sunos5-64-gcc \
 sunos5-smp \
 ultrix-gcc:
        (cd configs && rm -f current && ln -s $@ current)
@@ -134,10 +135,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.5
-LIB_NAME = MesaLib-6.5
-DEMO_NAME = MesaDemos-6.5
-GLUT_NAME = MesaGLUT-6.5
+DIRECTORY = Mesa-6.5.1
+LIB_NAME = MesaLib-6.5.1
+DEMO_NAME = MesaDemos-6.5.1
+GLUT_NAME = MesaGLUT-6.5.1
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
@@ -166,6 +167,7 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/glx.h                                   \
        $(DIRECTORY)/include/GL/glxext.h                                \
        $(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                                \
@@ -269,7 +271,6 @@ DRI_FILES = \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
        $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch]         \
        $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po           \
-       $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h        \
        $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]                     \
        $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile                    \
        $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile                    \
@@ -323,6 +324,8 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
+       $(DIRECTORY)/progs/osdemos/Makefile             \
+       $(DIRECTORY)/progs/osdemos/*.c                  \
        $(DIRECTORY)/progs/xdemos/Makefile*             \
        $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \
@@ -372,7 +375,7 @@ LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
 
 
 # Everything for new a Mesa release:
-tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_gz2 lib_zip demo_zip glut_zip md5
+tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
 
 
 rm_depend: