Merge branch 'mesa_7_5_branch'

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a77825e8f9acd6bb28b8fbb550aca57caae6cd6c..df0c2f594ec52b1c65a1c3251cdfba2fff408428 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ linux-icc \
 linux-icc-static \
 linux-llvm \
 linux-osmesa \
+linux-osmesa-static \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
@@ -181,7 +182,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.5-devel
+VERSION=7.6-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -327,6 +328,7 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/*/*/SConscript                       \
        $(DIRECTORY)/src/gallium/*/*/*/*.[ch]                           \
        $(DIRECTORY)/src/gallium/*/*/*/*.py                             \
+       $(DIRECTORY)/src/gallium/*/*/*/*/Makefile                       \
        $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch]                         \
 
 
@@ -386,7 +388,17 @@ GLW_FILES = \
        $(DIRECTORY)/src/glw/glw.pc.in                  \
        $(DIRECTORY)/src/glw/depend
 
+GLEW_FILES = \
+       $(DIRECTORY)/include/GL/glew.h                  \
+       $(DIRECTORY)/include/GL/glxew.h                 \
+       $(DIRECTORY)/include/GL/wglew.h                 \
+       $(DIRECTORY)/src/glew/*.c                       \
+       $(DIRECTORY)/src/glew/Makefile                  \
+       $(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                 \
@@ -402,7 +414,6 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/osdemos/Makefile             \
        $(DIRECTORY)/progs/osdemos/*.c                  \
        $(DIRECTORY)/progs/xdemos/Makefile*             \
-       $(DIRECTORY)/progs/xdemos/descrip.mms           \
        $(DIRECTORY)/progs/xdemos/*.[chf]               \
        $(DIRECTORY)/progs/redbook/Makefile*            \
        $(DIRECTORY)/progs/redbook/README               \
@@ -418,9 +429,6 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \
        $(DIRECTORY)/progs/ggi/*.c                      \
-       $(DIRECTORY)/windows/VC6/progs/demos/*.dsp      \
-       $(DIRECTORY)/windows/VC6/progs/progs.dsw        \
-       $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj   \
        $(DIRECTORY)/windows/VC7/progs/progs.sln
 
 GLUT_FILES = \
@@ -430,14 +438,11 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/glx/depend                \
        $(DIRECTORY)/src/glut/glx/glut.pc.in            \
        $(DIRECTORY)/src/glut/glx/*def                  \
-       $(DIRECTORY)/src/glut/glx/descrip.mms           \
-       $(DIRECTORY)/src/glut/glx/mms_depend            \
        $(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/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
        $(DIRECTORY)/src/glut/ggi/*.[ch]                \
        $(DIRECTORY)/src/glut/ggi/Makefile              \