glBindProgramARB dispatches to glBindProgramNV (remove _mesa_BindProgramARB).

[mesa.git] / src / mesa / main / Makefile.OSMesa16

diff --git a/src/mesa/main/Makefile.OSMesa16 b/src/mesa/main/Makefile.OSMesa16
index f1a9300c4040fcd74b686857540d862aa188befe..4a4951d482d8309e45749d6dc66778e63ece5037 100644 (file)
--- a/src/mesa/main/Makefile.OSMesa16
+++ b/src/mesa/main/Makefile.OSMesa16
@@ -1,17 +1,17 @@
-# $Id: Makefile.OSMesa16,v 1.2 2001/05/29 22:06:13 brianp Exp $
+# $Id: Makefile.OSMesa16,v 1.15 2003/04/17 02:33:11 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
-# Copyright (C) 1995-2001  Brian Paul
+# Version:  5.1
+# Copyright (C) 1995-2003  Brian Paul
 
-# Makefile for building Mesa for 16-bit/channel rendering with the OSMesa
+# Makefile for building Mesa for 16/32-bit/channel rendering with the OSMesa
 # driver.
 
 
 ##### MACROS #####
 
 GL_MAJOR = 1
-GL_MINOR = 2
+GL_MINOR = 4
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
@@ -22,46 +22,20 @@ LIBDIR = ../lib
 
 
 CORE_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_vb_fog.c \
-       tnl/t_vb_light.c \
-       tnl/t_vb_normals.c \
-       tnl/t_vb_points.c \
-       tnl/t_vb_render.c \
-       tnl/t_vb_texgen.c \
-       tnl/t_vb_texmat.c \
-       tnl/t_vb_vertex.c \
-       swrast_setup/ss_context.c \
-       swrast_setup/ss_triangle.c \
-       swrast_setup/ss_vb.c \
-       swrast_setup/ss_interp.c \
+       api_arrayelt.c \
        api_loopback.c \
        api_noop.c \
        api_validate.c \
        accum.c \
-       alpha.c \
+       arbprogram.c \
        attrib.c \
-       bitmap.c \
        blend.c \
+       bufferobj.c \
        buffers.c \
        clip.c \
        colortab.c \
-       config.c \
        context.c \
        convolve.c \
-       copypix.c \
        debug.c \
        depth.c \
        dispatch.c \
@@ -83,20 +57,18 @@ CORE_SOURCES = \
        imports.c \
        light.c \
        lines.c \
-       logic.c \
-       masking.c \
        matrix.c \
-       mem.c \
-       mmath.c \
+       nvprogram.c \
+       nvfragparse.c \
+       nvvertexec.c \
+       nvvertparse.c \
        pixel.c \
-       pixeltex.c \
        points.c \
        polygon.c \
        rastpos.c \
-       readpix.c \
-       scissor.c \
        state.c \
        stencil.c \
+       texcompress.c \
        texformat.c \
        teximage.c \
        texobj.c \
@@ -105,20 +77,17 @@ CORE_SOURCES = \
        texutil.c \
        varray.c \
        vtxfmt.c \
-       winpos.c \
        X86/x86.c \
        X86/common_x86.c \
        X86/3dnow.c \
        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 \
@@ -136,22 +105,45 @@ 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_pb.c \
+       swrast/s_nvfragprog.c \
        swrast/s_pixeltex.c \
        swrast/s_points.c \
        swrast/s_readpix.c \
-       swrast/s_scissor.c \
        swrast/s_span.c \
        swrast/s_stencil.c \
        swrast/s_texture.c \
        swrast/s_texstore.c \
        swrast/s_triangle.c \
        swrast/s_zoom.c \
+       swrast_setup/ss_context.c \
+       swrast_setup/ss_triangle.c \
+       swrast_setup/ss_vb.c \
+       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_vb_fog.c \
+       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 \
+       tnl/t_vb_vertex.c \
        OSmesa/osmesa.c
 
 ASM_SOURCES =
@@ -190,8 +182,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 #####
@@ -200,7 +193,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)