glsl/cl: Properly emit layout qualifier list.

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 4c4aba025e670df051e4c8fab5c169cb2ad6d842..ea5751d947a6c1666faa3297bfb18e9643f7d3bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,6 @@ catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
-darwin-static \
-darwin-static-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
@@ -105,6 +103,7 @@ irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
+linux-i965 \
 linux-alpha \
 linux-alpha-static \
 linux-cell \
@@ -126,6 +125,8 @@ linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
 linux-llvm \
+linux-llvm-debug \
+linux-opengl-es \
 linux-osmesa \
 linux-osmesa-static \
 linux-osmesa16 \
@@ -172,17 +173,20 @@ sunos5-v9 \
 sunos5-v9-static \
 sunos5-v9-cc-g++ \
 ultrix-gcc:
-       @ if test -f configs/current || test -L configs/current ; then \
-               echo "Please run 'make realclean' before changing configs" ; \
-               exit 1 ; \
+       @ if test -f configs/current -o -L configs/current; then \
+               if ! cmp configs/$@ configs/current > /dev/null; then \
+                       echo "Please run 'make realclean' before changing configs" ; \
+                       exit 1 ; \
+               fi ; \
+       else \
+               cd configs && rm -f current && ln -s $@ current ; \
        fi
-       (cd configs && rm -f current && ln -s $@ current)
        $(MAKE) default
 
 
 # Rules for making release tarballs
 
-VERSION=7.7-devel
+VERSION=7.7
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -225,6 +229,11 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wglext.h                                \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
+       $(DIRECTORY)/src/glsl/Makefile                                  \
+       $(DIRECTORY)/src/glsl/Makefile.template                         \
+       $(DIRECTORY)/src/glsl/*/Makefile                                \
+       $(DIRECTORY)/src/glsl/*/SConscript                              \
+       $(DIRECTORY)/src/glsl/*/*.[ch]                                  \
        $(DIRECTORY)/src/Makefile                                       \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
        $(DIRECTORY)/src/mesa/sources.mak                               \
@@ -240,7 +249,6 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/shader/*.[chly]                           \
        $(DIRECTORY)/src/mesa/shader/Makefile                           \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
-       $(DIRECTORY)/src/mesa/shader/grammar/*.[ch]                     \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
        $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
        $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]               \
@@ -314,9 +322,9 @@ ES_FILES = \
        $(DIRECTORY)/src/mesa/es/glapi/*.py                             \
        $(DIRECTORY)/src/mesa/es/state_tracker/*.[ch]                   \
        $(DIRECTORY)/src/mesa/es/main/*.[ch]                            \
+       $(DIRECTORY)/src/mesa/es/main/*.xml                             \
        $(DIRECTORY)/src/mesa/es/main/*.py                              \
-       $(DIRECTORY)/src/mesa/es/main/*.txt                             \
-       $(DIRECTORY)/src/mesa/es/main/es*_special                       \
+       $(DIRECTORY)/src/mesa/es/main/*.dtd                             \
        $(DIRECTORY)/src/mesa/es/Makefile                               \
        $(DIRECTORY)/src/mesa/es/sources.mak                            \
 
@@ -354,8 +362,8 @@ DRI_FILES = \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
        $(DIRECTORY)/include/GL/internal/sarea.h                        \
        $(DIRECTORY)/src/glx/Makefile                                   \
-       $(DIRECTORY)/src/glx/x11/Makefile                               \
-       $(DIRECTORY)/src/glx/x11/*.[ch]                                 \
+       $(DIRECTORY)/src/glx/Makefile                                   \
+       $(DIRECTORY)/src/glx/*.[ch]                                     \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile                      \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
        $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in                     \
@@ -454,8 +462,7 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/windml/Makefile.ugl          \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \
-       $(DIRECTORY)/progs/ggi/*.c                      \
-       $(DIRECTORY)/windows/VC7/progs/progs.sln
+       $(DIRECTORY)/progs/ggi/*.c
 
 GLUT_FILES = \
        $(DIRECTORY)/include/GL/glut.h                  \
@@ -478,13 +485,11 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/mini/glut.pc.in           \
        $(DIRECTORY)/src/glut/directfb/Makefile         \
        $(DIRECTORY)/src/glut/directfb/NOTES            \
-       $(DIRECTORY)/src/glut/directfb/*[ch]            \
-       $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp    \
-       $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
+       $(DIRECTORY)/src/glut/directfb/*[ch]
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
-       $(TOP)/src/glx/x11/depend       \
+       $(TOP)/src/glx/depend           \
        $(TOP)/src/glw/depend           \
        $(TOP)/src/glut/glx/depend      \
        $(TOP)/src/glu/sgi/depend