2 files changed, 48 insertions, 35 deletions

diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
index d70cec3830..3a98a30ead 100644
--- a/src/mesa/shader/descrip.mms
+++ b/src/mesa/shader/descrip.mms
@@ -1,6 +1,6 @@
 # Makefile for core library for VMS
 # contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 20 November 2006
+# Last revision : 8 May 2007
 .first
 	define gl [---.include.gl]
 	define math [-.math]
@@ -23,11 +23,16 @@ SOURCES = \
 	arbprogram.c \
 	nvfragparse.c \
 	nvprogram.c \
-	nvvertexec.c \
 	nvvertparse.c \
 	program.c \
-	shaderobjects.c \
-	shaderobjects_3dlabs.c
+	programopt.c \
+	prog_debug.c \
+	prog_execute.c \
+	prog_instruction.c \
+	prog_parameter.c \
+	prog_print.c \
+	prog_statevars.c \
+	shader_api.c
 
 OBJECTS = \
 	atifragshader.obj,\
@@ -35,12 +40,16 @@ OBJECTS = \
 	arbprogram.obj,\
 	nvfragparse.obj,\
 	nvprogram.obj,\
-	nvvertexec.obj,\
 	nvvertparse.obj,\
 	program.obj,\
-	shaderobjects.obj,\
-	shaderobjects_3dlabs.obj
-
+	programopt.obj,\
+	prog_debug.obj,\
+	prog_execute.obj,\
+	prog_instruction.obj,\
+	prog_parameter.obj,\
+	prog_print.obj,\
+	prog_statevars.obj,\
+	shader_api.obj
 
 ##### RULES #####
 
@@ -68,9 +77,13 @@ arbprogparse.obj : arbprogparse.c
 arbprogram.obj : arbprogram.c
 nvfragparse.obj : nvfragparse.c
 nvprogram.obj : nvprogram.c
-nvvertexec.obj : nvvertexec.c
 nvvertparse.obj : nvvertparse.c
 program.obj : program.c
-shaderobjects.obj : shaderobjects.c
-	cc$(CFLAGS)/nowarn shaderobjects.c
-shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
+programopt. obj : programopt.c
+prog_debug.obj : prog_debug.c
+prog_execute.obj : prog_execute.c
+prog_instruction.obj : prog_instruction.c
+prog_parameter.obj : prog_parameter.c
+prog_print.obj : prog_print.c
+prog_statevars.obj : prog_statevars.c
+shader_api.obj : shader_api.c
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
index c86763718a..f430c59146 100644
--- a/src/mesa/shader/slang/descrip.mms
+++ b/src/mesa/shader/slang/descrip.mms
@@ -1,6 +1,6 @@
 # Makefile for core library for VMS
 # contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 17 March 2006
+# Last revision : 8 May 2007
 
 .first
 	define gl [----.include.gl]
@@ -21,15 +21,13 @@ CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ie
 SOURCES = \
 	slang_compile.c,slang_preprocess.c
 
-OBJECTS = \
-	slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\
-	slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\
-	slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\
-	slang_storage.obj,slang_assemble_assignment.obj,\
-	slang_compile_function.obj,slang_compile_struct.obj,\
-	slang_compile_variable.obj,slang_compile_operation.obj,\
-	slang_library_noise.obj,slang_link.obj,slang_export.obj,\
-	slang_analyse.obj,slang_library_texsample.obj
+OBJECTS = slang_builtin.obj,slang_codegen.obj,slang_compile.obj,\
+	slang_compile_function.obj,slang_compile_operation.obj,\
+	slang_compile_struct.obj,slang_compile_variable.obj,slang_emit.obj,\
+	slang_ir.obj,slang_label.obj,slang_library_noise.obj,slang_link.obj,\
+	slang_log.obj,slang_mem.obj,slang_preprocess.obj,slang_print.obj,\
+	slang_simplify.obj,slang_storage.obj,slang_typeinfo.obj,\
+	slang_utility.obj,slang_vartable.obj
 
 ##### RULES #####
 
@@ -44,22 +42,24 @@ clean :
 	purge
 	delete *.obj;*
 
+slang_builtin.obj : slang_builtin.c
+slang_codegen.obj : slang_codegen.c
 slang_compile.obj : slang_compile.c
-slang_preprocess.obj : slang_preprocess.c
-slang_utility.obj : slang_utility.c
-slang_execute.obj : slang_execute.c
-slang_assemble.obj : slang_assemble.c
-slang_assemble_conditional.obj : slang_assemble_conditional.c
-slang_assemble_constructor.obj : slang_assemble_constructor.c
-slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c
-slang_storage.obj : slang_storage.c
-slang_assemble_assignment.obj : slang_assemble_assignment.c
 slang_compile_function.obj : slang_compile_function.c
+slang_compile_operation.obj : slang_compile_operation.c
 slang_compile_struct.obj : slang_compile_struct.c
 slang_compile_variable.obj : slang_compile_variable.c
-slang_compile_operation.obj : slang_compile_operation.c
+slang_emit.obj : slang_emit.c
+slang_ir.obj : slang_ir.c
+slang_label.obj : slang_label.c
 slang_library_noise.obj : slang_library_noise.c
 slang_link.obj : slang_link.c
-slang_export.obj : slang_export.c
-slang_analyse.obj : slang_analyse.c
-slang_library_texsample.obj : slang_library_texsample.c
+slang_log.obj : slang_log.c
+slang_mem.obj : slang_mem.c
+slang_preprocess.obj : slang_preprocess.c
+slang_print.obj : slang_print.c
+slang_simplify.obj : slang_simplify.c
+slang_storage.obj : slang_storage.c
+slang_typeinfo.obj : slang_typeinfo.c
+slang_utility.obj : slang_utility.c
+slang_vartable.obj : slang_vartable.c