Merge branch 'master' of git.freedesktop.org:/git/mesa/mesa into debian-experimental

Conflicts:

	.gitignore
	Makefile
	bin/mklib
	configs/.gitignore
	configs/default
	configs/freebsd
	configs/freebsd-dri
	configs/linux-osmesa
	configs/linux-osmesa16
	configs/linux-osmesa16-static
	configs/linux-osmesa32
	docs/download.html
	docs/install.html
	docs/news.html
	docs/relnotes.html
	doxygen/Makefile
	doxygen/doxy.bat
	doxygen/header.html
	doxygen/header_subset.html
	include/GL/internal/dri_interface.h
	progs/demos/.gitignore
	progs/directfb/Makefile
	progs/egl/Makefile
	progs/fbdev/Makefile
	progs/fbdev/glfbdevtest.c
	progs/fp/Makefile
	progs/glsl/.gitignore
	progs/glsl/Makefile
	progs/glsl/bump.c
	progs/glsl/mandelbrot.c
	progs/glsl/noise.c
	progs/glsl/toyball.c
	progs/miniglx/Makefile
	progs/samples/.gitignore
	progs/slang/Makefile
	progs/tests/.gitignore
	progs/tests/Makefile
	progs/tests/arbnpot.c
	progs/tests/cva.c
	progs/tests/dinoshade.c
	progs/tests/drawbuffers.c
	progs/tests/fbotest2.c
	progs/tests/fbotexture.c
	progs/tests/getprocaddress.c
	progs/tests/mipmap_limits.c
	progs/tests/multipal.c
	progs/tests/texline.c
	progs/tools/trace/Makefile
	progs/trivial/Makefile
	progs/trivial/dlist-edgeflag-dangling.c
	progs/trivial/dlist-edgeflag.c
	progs/trivial/point-param.c
	progs/trivial/quad-clip-nearplane.c
	progs/trivial/tri.c
	progs/vp/Makefile
	progs/xdemos/.gitignore
	progs/xdemos/Makefile
	progs/xdemos/glthreads.c
	src/egl/Makefile
	src/egl/drivers/demo/Makefile
	src/egl/drivers/dri/Makefile
	src/egl/main/Makefile
	src/glu/mesa/Makefile
	src/glu/mesa/Makefile.m32
	src/glu/mesa/project.c
	src/glu/mini/project.c
	src/glut/directfb/Makefile
	src/glut/directfb/callback.c
	src/glut/directfb/events.c
	src/glut/directfb/internal.h
	src/glut/directfb/window.c
	src/glut/os2/Makefile
	src/glut/os2/WarpWin.cpp
	src/glut/os2/glutOverlay.cpp
	src/glut/os2/glut_8x13.cpp
	src/glut/os2/glut_9x15.cpp
	src/glut/os2/glut_bitmap.cpp
	src/glut/os2/glut_cindex.cpp
	src/glut/os2/glut_cmap.cpp
	src/glut/os2/glut_cursor.cpp
	src/glut/os2/glut_event.cpp
	src/glut/os2/glut_ext.cpp
	src/glut/os2/glut_fullscrn.cpp
	src/glut/os2/glut_gamemode.cpp
	src/glut/os2/glut_get.cpp
	src/glut/os2/glut_hel10.cpp
	src/glut/os2/glut_hel12.cpp
	src/glut/os2/glut_hel18.cpp
	src/glut/os2/glut_init.cpp
	src/glut/os2/glut_input.cpp
	src/glut/os2/glut_key.cpp
	src/glut/os2/glut_keyctrl.cpp
	src/glut/os2/glut_keyup.cpp
	src/glut/os2/glut_mesa.cpp
	src/glut/os2/glut_modifier.cpp
	src/glut/os2/glut_roman.cpp
	src/glut/os2/glut_shapes.cpp
	src/glut/os2/glut_stroke.cpp
	src/glut/os2/glut_swap.cpp
	src/glut/os2/glut_teapot.cpp
	src/glut/os2/glut_tr24.cpp
	src/glut/os2/glut_util.cpp
	src/glut/os2/glut_vidresize.cpp
	src/glut/os2/glut_warp.cpp
	src/glut/os2/glut_win.cpp
	src/glut/os2/glut_winmisc.cpp
	src/glut/os2/glutbitmap.h
	src/glut/os2/glutstroke.h
	src/glut/os2/layerutil.h
	src/glut/os2/libGlut.DEF
	src/glut/os2/os2_glx.cpp
	src/glut/os2/os2_menu.cpp
	src/glut/os2/os2_winproc.cpp
	src/glw/Makefile
	src/glx/mini/Makefile
	src/glx/mini/miniglx.c
	src/glx/x11/glxext.c
	src/mesa/Makefile
	src/mesa/drivers/allegro/amesa.c
	src/mesa/drivers/allegro/direct.h
	src/mesa/drivers/allegro/generic.h
	src/mesa/drivers/d3d/D3DCAPS.CPP
	src/mesa/drivers/d3d/D3DHAL.H
	src/mesa/drivers/d3d/D3DInit.cpp
	src/mesa/drivers/d3d/D3DMESA.H
	src/mesa/drivers/d3d/D3DRaster.cpp
	src/mesa/drivers/d3d/D3DTEXT.CPP
	src/mesa/drivers/d3d/D3DTextureMgr.cpp
	src/mesa/drivers/d3d/D3DTextureMgr.h
	src/mesa/drivers/d3d/D3DUTILS.CPP
	src/mesa/drivers/d3d/DDrawPROCS.c
	src/mesa/drivers/d3d/DEBUG.C
	src/mesa/drivers/d3d/DEBUG.H
	src/mesa/drivers/d3d/DbgEnv.bat
	src/mesa/drivers/d3d/MAKEFILE
	src/mesa/drivers/d3d/OPENGL32.DEF
	src/mesa/drivers/d3d/WGL.C
	src/mesa/drivers/dri/Makefile.template
	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/common/dri_util.c
	src/mesa/drivers/dri/common/dri_util.h
	src/mesa/drivers/dri/common/xmlconfig.c
	src/mesa/drivers/dri/glcore/Makefile
	src/mesa/drivers/dri/i915/i915_fragprog.c
	src/mesa/drivers/dri/i915/i915_program.h
	src/mesa/drivers/dri/i915/i915_texprog.c
	src/mesa/drivers/dri/i915/i915_texstate.c
	src/mesa/drivers/dri/i915/i915_vtbl.c
	src/mesa/drivers/dri/i915/intel_context.c
	src/mesa/drivers/dri/i915/intel_context.h
	src/mesa/drivers/dri/i915/intel_pixel.c
	src/mesa/drivers/dri/i915/intel_render.c
	src/mesa/drivers/dri/i915/intel_screen.c
	src/mesa/drivers/dri/i915/intel_state.c
	src/mesa/drivers/dri/i915/intel_tex.c
	src/mesa/drivers/dri/i915/intel_tris.c
	src/mesa/drivers/dri/i915tex/i830_reg.h
	src/mesa/drivers/dri/i915tex/i830_texstate.c
	src/mesa/drivers/dri/i915tex/i830_vtbl.c
	src/mesa/drivers/dri/i915tex/i915_fragprog.c
	src/mesa/drivers/dri/i915tex/i915_metaops.c
	src/mesa/drivers/dri/i915tex/i915_tex_layout.c
	src/mesa/drivers/dri/i915tex/i915_texstate.c
	src/mesa/drivers/dri/i915tex/i915_vtbl.c
	src/mesa/drivers/dri/i915tex/intel_render.c
	src/mesa/drivers/dri/i915tex/intel_screen.c
	src/mesa/drivers/dri/i915tex/intel_tris.c
	src/mesa/drivers/dri/i965/brw_aub.c
	src/mesa/drivers/dri/i965/brw_aub_playback.c
	src/mesa/drivers/dri/i965/brw_cc.c
	src/mesa/drivers/dri/i965/brw_clip.c
	src/mesa/drivers/dri/i965/brw_clip_state.c
	src/mesa/drivers/dri/i965/brw_clip_util.c
	src/mesa/drivers/dri/i965/brw_context.c
	src/mesa/drivers/dri/i965/brw_curbe.c
	src/mesa/drivers/dri/i965/brw_defines.h
	src/mesa/drivers/dri/i965/brw_draw.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c
	src/mesa/drivers/dri/i965/brw_eu.h
	src/mesa/drivers/dri/i965/brw_eu_emit.c
	src/mesa/drivers/dri/i965/brw_gs_state.c
	src/mesa/drivers/dri/i965/brw_misc_state.c
	src/mesa/drivers/dri/i965/brw_sf_emit.c
	src/mesa/drivers/dri/i965/brw_sf_state.c
	src/mesa/drivers/dri/i965/brw_state_cache.c
	src/mesa/drivers/dri/i965/brw_state_pool.c
	src/mesa/drivers/dri/i965/brw_tex.c
	src/mesa/drivers/dri/i965/brw_tex_layout.c
	src/mesa/drivers/dri/i965/brw_vs_state.c
	src/mesa/drivers/dri/i965/brw_vs_tnl.c
	src/mesa/drivers/dri/i965/brw_wm.c
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/drivers/dri/i965/brw_wm_glsl.c
	src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
	src/mesa/drivers/dri/i965/brw_wm_state.c
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
	src/mesa/drivers/dri/i965/bufmgr_fake.c
	src/mesa/drivers/dri/i965/intel_batchbuffer.c
	src/mesa/drivers/dri/i965/intel_batchbuffer.h
	src/mesa/drivers/dri/i965/intel_blit.c
	src/mesa/drivers/dri/i965/intel_blit.h
	src/mesa/drivers/dri/i965/intel_buffers.c
	src/mesa/drivers/dri/i965/intel_context.c
	src/mesa/drivers/dri/i965/intel_context.h
	src/mesa/drivers/dri/i965/intel_mipmap_tree.c
	src/mesa/drivers/dri/i965/intel_mipmap_tree.h
	src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
	src/mesa/drivers/dri/i965/intel_pixel_copy.c
	src/mesa/drivers/dri/i965/intel_screen.c
	src/mesa/drivers/dri/i965/intel_tex_validate.c
	src/mesa/drivers/dri/i965/server/i830_common.h
	src/mesa/drivers/dri/intel/intel_batchbuffer.c
	src/mesa/drivers/dri/intel/intel_batchbuffer.h
	src/mesa/drivers/dri/intel/intel_blit.c
	src/mesa/drivers/dri/intel/intel_buffers.c
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_context.h
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.h
	src/mesa/drivers/dri/intel/intel_screen.h
	src/mesa/drivers/dri/r200/r200_texstate.c
	src/mesa/drivers/dri/r300/r300_cmdbuf.c
	src/mesa/drivers/dri/r300/r300_context.h
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_reg.h
	src/mesa/drivers/dri/r300/r300_state.c
	src/mesa/drivers/dri/r300/r300_tex.h
	src/mesa/drivers/dri/r300/r300_texstate.c
	src/mesa/drivers/dri/radeon/radeon_screen.c
	src/mesa/drivers/windows/gdi/wmesa.c
	src/mesa/drivers/x11/fakeglx.c
	src/mesa/drivers/x11/xm_dd.c
	src/mesa/glapi/Makefile
	src/mesa/glapi/dispatch.h
	src/mesa/glapi/glapioffsets.h
	src/mesa/glapi/glapitable.h
	src/mesa/glapi/glapitemp.h
	src/mesa/glapi/glprocs.h
	src/mesa/main/api_validate.c
	src/mesa/main/attrib.c
	src/mesa/main/config.h
	src/mesa/main/context.c
	src/mesa/main/context.h
	src/mesa/main/dlist.c
	src/mesa/main/drawpix.c
	src/mesa/main/enums.c
	src/mesa/main/fbobject.c
	src/mesa/main/image.c
	src/mesa/main/imports.h
	src/mesa/main/mtypes.h
	src/mesa/main/points.c
	src/mesa/main/state.c
	src/mesa/main/texcompress_fxt1.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/teximage.c
	src/mesa/main/texobj.c
	src/mesa/main/texstate.c
	src/mesa/main/version.h
	src/mesa/shader/prog_execute.c
	src/mesa/shader/program.c
	src/mesa/shader/shader_api.c
	src/mesa/shader/slang/library/slang_core.gc
	src/mesa/shader/slang/library/slang_core_gc.h
	src/mesa/shader/slang/slang_codegen.c
	src/mesa/sources
	src/mesa/sparc/glapi_sparc.S
	src/mesa/swrast/s_aalinetemp.h
	src/mesa/swrast/s_aatriangle.c
	src/mesa/swrast/s_aatritemp.h
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_copypix.c
	src/mesa/swrast/s_drawpix.c
	src/mesa/swrast/s_fragprog.c
	src/mesa/swrast/s_pointtemp.h
	src/mesa/swrast/s_readpix.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_texfilter.c
	src/mesa/swrast/s_tritemp.h
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_draw.c
	src/mesa/tnl/t_vb_fog.c
	src/mesa/tnl/t_vb_program.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/vbo/vbo_split_copy.c
	src/mesa/x86-64/xform4.S
	src/mesa/x86/common_x86.c
	src/mesa/x86/glapi_x86.S
	windows/VC6/mesa/mesa/mesa.dsp

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
index 6c6184b2c3c..648f683dfa4 100644
--- a/src/mesa/drivers/x11/descrip.mms
+++ b/src/mesa/drivers/x11/descrip.mms
@@ -1,15 +1,19 @@
 # Makefile for core library for VMS
-# contributed by Jouk Jansen  [email protected]
-# Last revision : 16 June 2003
+# contributed by Jouk Jansen  [email protected]
+# Last revision : 3 October 2007
 
 .first
 	define gl [----.include.gl]
 	define math [--.math]
 	define tnl [--.tnl]
+	define vbo [--.vbo]
 	define swrast [--.swrast]
 	define swrast_setup [--.swrast_setup]
 	define array_cache [--.array_cache]
 	define drivers [-]
+	define glapi [--.glapi]
+	define main [--.main]
+	define shader [--.shader]
 
 .include [----]mms-config.
 
@@ -17,7 +21,7 @@
 
 VPATH = RCS
 
-INCDIR = [----.include],[--.main],[--.glapi]
+INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
 LIBDIR = [----.lib]
 CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm