X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2FMakefile.OSMesa16;h=206c4d9376e19440b34e06904fc339e8d0ff73f1;hb=9ac51f57efe07ed43a1e4224a7f5daddec401b36;hp=eeb32a264b6de43c6f6e7a31e23b6244fd3f9f99;hpb=ac8c241e6419f1bd85aa37849a8d7b3c050ff97b;p=mesa.git

diff --git a/src/mesa/main/Makefile.OSMesa16 b/src/mesa/main/Makefile.OSMesa16
index eeb32a264b6..206c4d9376e 100644
--- a/src/mesa/main/Makefile.OSMesa16
+++ b/src/mesa/main/Makefile.OSMesa16
@@ -1,8 +1,7 @@
-# $Id: Makefile.OSMesa16,v 1.6 2002/02/02 21:41:58 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  4.1
-# Copyright (C) 1995-2002  Brian Paul
+# Version:  5.1
+# Copyright (C) 1995-2003  Brian Paul
 
 # Makefile for building Mesa for 16/32-bit/channel rendering with the OSMesa
 # driver.
@@ -11,7 +10,7 @@
 ##### MACROS #####
 
 GL_MAJOR = 1
-GL_MINOR = 2
+GL_MINOR = 4
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
@@ -22,16 +21,18 @@ LIBDIR = ../lib
 
 
 CORE_SOURCES = \
+	api_arrayelt.c \
 	api_loopback.c \
 	api_noop.c \
 	api_validate.c \
 	accum.c \
+	arbprogram.c \
 	attrib.c \
 	blend.c \
+	bufferobj.c \
 	buffers.c \
 	clip.c \
 	colortab.c \
-	config.c \
 	context.c \
 	convolve.c \
 	debug.c \
@@ -56,14 +57,17 @@ CORE_SOURCES = \
 	light.c \
 	lines.c \
 	matrix.c \
-	mem.c \
-	mmath.c \
+	nvprogram.c \
+	nvfragparse.c \
+	nvvertexec.c \
+	nvvertparse.c \
 	pixel.c \
 	points.c \
 	polygon.c \
 	rastpos.c \
 	state.c \
 	stencil.c \
+	texcompress.c \
 	texformat.c \
 	teximage.c \
 	texobj.c \
@@ -78,13 +82,11 @@ CORE_SOURCES = \
 	X86/sse.c \
 	math/m_debug_clip.c \
 	math/m_debug_norm.c \
-	math/m_debug_vertex.c \
 	math/m_debug_xform.c \
 	math/m_eval.c \
 	math/m_matrix.c \
 	math/m_translate.c \
 	math/m_vector.c \
-	math/m_vertices.c \
 	math/m_xform.c \
 	array_cache/ac_context.c \
 	array_cache/ac_import.c \
@@ -102,11 +104,11 @@ CORE_SOURCES = \
 	swrast/s_drawpix.c \
 	swrast/s_feedback.c \
 	swrast/s_fog.c \
-	swrast/s_histogram.c \
 	swrast/s_imaging.c \
 	swrast/s_lines.c \
 	swrast/s_logic.c \
 	swrast/s_masking.c \
+	swrast/s_nvfragprog.c \
 	swrast/s_pixeltex.c \
 	swrast/s_points.c \
 	swrast/s_readpix.c \
@@ -136,6 +138,7 @@ CORE_SOURCES = \
 	tnl/t_vb_light.c \
 	tnl/t_vb_normals.c \
 	tnl/t_vb_points.c \
+	tnl/t_vb_program.c \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
 	tnl/t_vb_texmat.c \
@@ -178,8 +181,9 @@ X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c
 	./X86/gen_matypes > X86/matypes.h
 	rm -f X86/gen_matypes X86/*.o
 
-$(ASM_SOURCES): X86/matypes.h
-
+# We have X86/matypes.h depend on X86/matypes.h so that if ASM_SOURCES
+# is empty we don't get an invalid Makefile.
+$(ASM_SOURCES) X86/matypes.h: X86/matypes.h
 
 
 ##### TARGETS #####
@@ -188,7 +192,7 @@ $(ASM_SOURCES): X86/matypes.h
 #	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~ */*.o */*~ *.lo *.la
+	-rm -f *.o *~ */*.o */*~ *.lo *.la
 	-rm -rf .libs
 
 targets: $(LIBDIR)/$(OSMESA16_LIB)