another fix to clear_32bit_ximage()

[mesa.git] / src / mesa / Makefile.X11

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 9ea476376da41a56acacd4f13b7f31adedad038e..7a7d18a23664318b3ceb5582895d5b201a90df3f 100644 (file)
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,8 +1,8 @@
-# $Id: Makefile.X11,v 1.36 2000/12/26 05:09:27 keithw Exp $
+# $Id: Makefile.X11,v 1.51 2001/03/29 06:46:15 gareth Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
-# Copyright (C) 1995-2000  Brian Paul
+# Copyright (C) 1995-2001  Brian Paul
 
 # Makefile for core library
 
@@ -21,6 +21,31 @@ 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_loopback.c \
        api_noop.c \
        api_validate.c \
@@ -49,10 +74,8 @@ CORE_SOURCES = \
        fog.c \
        get.c \
        glapi.c \
-       glapinoop.c \
        glthread.c \
        hash.c \
-       highpc.c \
        hint.c \
        histogram.c \
        image.c \
@@ -60,7 +83,6 @@ CORE_SOURCES = \
        light.c \
        lines.c \
        logic.c \
-       lowpc.c \
        masking.c \
        matrix.c \
        mem.c \
@@ -74,10 +96,11 @@ CORE_SOURCES = \
        scissor.c \
        state.c \
        stencil.c \
+       texformat.c \
        teximage.c \
        texobj.c \
        texstate.c \
-       texture.c \
+       texstore.c \
        texutil.c \
        varray.c \
        vtxfmt.c \
@@ -85,10 +108,9 @@ CORE_SOURCES = \
        X86/x86.c \
        X86/common_x86.c \
        X86/3dnow.c \
-       X86/katmai.c \
-       swrast_setup/ss_context.c \
-       swrast_setup/ss_triangle.c \
-       swrast_setup/ss_vb.c \
+       X86/sse.c \
+       math/m_debug_norm.c \
+       math/m_debug_vertex.c \
        math/m_debug_xform.c \
        math/m_eval.c \
        math/m_matrix.c \
@@ -98,28 +120,6 @@ CORE_SOURCES = \
        math/m_xform.c \
        array_cache/ac_context.c \
        array_cache/ac_import.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_material.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/s_aaline.c \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
@@ -135,20 +135,21 @@ CORE_SOURCES = \
        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_pixeltex.c \
        swrast/s_points.c \
-       swrast/s_quads.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/s_zoom.c
 
 
 DRIVER_SOURCES = \
@@ -183,9 +184,9 @@ DRIVER_SOURCES = \
        Trace/tr_write.c
 
 
-ASM_SOURCES = 
+ASM_SOURCES =
 
-ADDITIONAL_OBJ = 
+ADDITIONAL_OBJ =
 
 OBJECTS = $(ASM_SOURCES:.S=.o) \
        $(CORE_SOURCES:.c=.o) \
@@ -276,10 +277,17 @@ X86/x86.o: X86/x86.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X86/common_x86.o: X86/common_x86.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+X86/common_x86_asm.o: X86/common_x86_asm.S X86/matypes.h
 X86/3dnow.o: X86/3dnow.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-X86/katmai.o: X86/katmai.c
+X86/sse.o: X86/sse.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c
+       $(CC) -I. -I$(INCDIR) $(CFLAGS) X86/gen_matypes.c -o X86/gen_matypes
+       ./X86/gen_matypes > X86/matypes.h
+       rm -f X86/gen_matypes X86/*.o
+
+$(ASM_SOURCES): X86/matypes.h
 
 GGI/ggimesa.o: GGI/ggimesa.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
@@ -335,7 +343,7 @@ include depend
 #
 # Run 'make dep' to update the dependencies if you change what's included
 # by any source file.
-# 
+#
 dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
        makedepend -fdepend -Y -I../include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)