updated list of files since merging vtx branch

1 files changed, 16 insertions, 15 deletions

diff --git a/src/mesa/Makefile.OSMesa16 b/src/mesa/Makefile.OSMesa16
index f451685a1a..08156fcb4a 100644
--- a/src/mesa/Makefile.OSMesa16
+++ b/src/mesa/Makefile.OSMesa16
@@ -31,6 +31,7 @@ MAIN_SOURCES = \
 	main/api_noop.c \
 	main/api_validate.c \
 	main/accum.c \
+	main/arbparse.c \
 	main/arbprogram.c \
 	main/arbfragparse.c \
 	main/arbvertparse.c \
@@ -141,16 +142,10 @@ TNL_SOURCES = \
 	tnl/t_array_api.c \
 	tnl/t_array_import.c \
 	tnl/t_context.c \
-	tnl/t_eval_api.c \
-	tnl/t_imm_alloc.c \
-	tnl/t_imm_api.c \
-	tnl/t_imm_debug.c \
-	tnl/t_imm_dlist.c \
-	tnl/t_imm_elt.c \
-	tnl/t_imm_eval.c \
-	tnl/t_imm_exec.c \
-	tnl/t_imm_fixup.c \
 	tnl/t_pipeline.c \
+	tnl/t_save_api.c \
+	tnl/t_save_loopback.c \
+	tnl/t_save_playback.c \
 	tnl/t_vb_fog.c \
 	tnl/t_vb_light.c \
 	tnl/t_vb_normals.c \
@@ -159,11 +154,15 @@ TNL_SOURCES = \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
 	tnl/t_vb_texmat.c \
-	tnl/t_vb_vertex.c
+	tnl/t_vb_vertex.c \
+	tnl/t_vtx_api.c \
+	tnl/t_vtx_eval.c \
+	tnl/t_vtx_exec.c 
 
-ASM_C_SOURCES = \
-	x86/x86.c \
+
+ASM_C_SOURCES =	\
 	x86/common_x86.c \
+	x86/x86.c \
 	x86/3dnow.c \
 	x86/sse.c \
 	sparc/sparc.c
@@ -200,9 +199,9 @@ CORE_SOURCES = \
 	$(GLAPI_SOURCES)	\
 	$(MATH_SOURCES)		\
 	$(ARRAY_CACHE_SOURCES)	\
+	$(TNL_SOURCES)		\
 	$(SWRAST_SOURCES)	\
 	$(SWRAST_SETUP_SOURCES)	\
-	$(TNL_SOURCES)		\
 	$(ASM_C_SOURCES)
 
 # This will probably get set to $(X86_SOURCES) in Make-config:
@@ -237,6 +236,8 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/swrast \
 	-I$(TOP)/src/mesa/swrast_setup
 
+
+
 ##### RULES #####
 
 .c.o:
@@ -290,9 +291,9 @@ tags:
 
 # Remove .o and backup files
 clean:
-	-rm *.a
+	-rm -f *.a
 	-rm -f */*.o */*~ */*.o */*~
-	-rm -f drivers/*/*.o
+	-rm -f drivers/*/*.o drivers/*/*/*.o
 
 
 include $(TOP)/Make-config