omit CVS directories from tarballs, bump version to 6.1

diff --git a/Make-config b/Make-config
index 2b81aadbb52704438aac8fa617635f5c649ca612..835be9d42d7128cde740d3437c659b885ef3b25f 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -9,7 +9,7 @@
 
 
 MESA_MAJOR=6
-MESA_MINOR=0
+MESA_MINOR=1
 MESA_TINY=0
 VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 
@@ -739,7 +739,7 @@ linux-solo:
        "GLUT_LIB = libglut.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "CFLAGS = -g -std=c99 -pedantic -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "CXXFLAGS = -g -Wall -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread -lexpat" \

diff --git a/Makefile.X11 b/Makefile.X11
index 534b7e22f9b91fcf370f35794db709abe5e1a0f1..565b4cf7326b69610e2a78416ab4fc2805591de5 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.107 2004/01/11 17:15:03 brianp Exp $
+# $Id: Makefile.X11,v 1.108 2004/01/19 16:56:50 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  6.0
+# Version:  6.1
 # 
 # Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
 # 
@@ -473,10 +473,10 @@ cvsclean: realclean
 
 
 
-DIRECTORY = Mesa-6.0
-LIB_NAME = MesaLib-6.0
-DEMO_NAME = MesaDemos-6.0
-GLU_NAME = MesaGLU-6.0
+DIRECTORY = Mesa-6.1
+LIB_NAME = MesaLib-6.1
+DEMO_NAME = MesaDemos-6.1
+GLU_NAME = MesaGLU-6.1
 GLUT_NAME = GLUT-3.7
 
 
@@ -631,14 +631,16 @@ DEMO_FILES =      \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
        $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
-       $(DIRECTORY)/progs/images/*                     \
+       $(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/demos/Windows/*              \
+       $(DIRECTORY)/progs/demos/Windows/*.dsp          \
+       $(DIRECTORY)/progs/demos/Windows/*.dsw          \
        $(DIRECTORY)/progs/xdemos/Makefile*             \
        $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \