Merge branch '7.8'

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 68b5adffbe9996b0da1c9c456984bd67a923eafc..e0d852e534ef590a62c3792b201211437d263dd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.8-rc1
+VERSION=7.9-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -215,7 +215,6 @@ MAIN_FILES = \
        $(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                                \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
@@ -324,6 +323,7 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/*/Makefile                             \
        $(DIRECTORY)/src/gallium/*/SConscript                           \
        $(DIRECTORY)/src/gallium/*/*/Makefile                           \
+       $(DIRECTORY)/src/gallium/*/*/Makefile.egl                       \
        $(DIRECTORY)/src/gallium/*/*/Makefile.template                  \
        $(DIRECTORY)/src/gallium/*/*/SConscript                         \
        $(DIRECTORY)/src/gallium/*/*/*.[ch]                             \
@@ -407,6 +407,14 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
+       $(DIRECTORY)/progs/egl/Makefile                 \
+       $(DIRECTORY)/progs/egl/*.[ch]                   \
+       $(DIRECTORY)/progs/es1/*/Makefile               \
+       $(DIRECTORY)/progs/es1/*/*.[ch]                 \
+       $(DIRECTORY)/progs/es2/*/Makefile               \
+       $(DIRECTORY)/progs/es2/*/*.[ch]                 \
+       $(DIRECTORY)/progs/openvg/*/Makefile            \
+       $(DIRECTORY)/progs/openvg/*/*.[ch]              \
        $(DIRECTORY)/progs/fbdev/Makefile               \
        $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
        $(DIRECTORY)/progs/objviewer/*.[ch]             \