another fix to clear_32bit_ximage()
[mesa.git] / src / mesa / Makefile.X11
index fd62b89a5bef10241faef76182aa259f649b007a..7a7d18a23664318b3ceb5582895d5b201a90df3f 100644 (file)
@@ -1,8 +1,8 @@
-# $Id: Makefile.X11,v 1.29 2000/11/05 23:19:23 brianp 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,10 +21,37 @@ 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 \
        accum.c \
        alpha.c \
        attrib.c \
-       bbox.c \
        bitmap.c \
        blend.c \
        buffers.c \
@@ -34,8 +61,7 @@ CORE_SOURCES = \
        context.c \
        convolve.c \
        copypix.c \
-       cva.c \
-       debug_xform.c \
+       debug.c \
        depth.c \
        dispatch.c \
        dlist.c \
@@ -48,56 +74,52 @@ CORE_SOURCES = \
        fog.c \
        get.c \
        glapi.c \
-       glapinoop.c \
        glthread.c \
        hash.c \
-       highpc.c \
        hint.c \
+       histogram.c \
        image.c \
-       imaging.c \
        imports.c \
        light.c \
        lines.c \
        logic.c \
-       lowpc.c \
        masking.c \
        matrix.c \
        mem.c \
        mmath.c \
-       pipeline.c \
        pixel.c \
        pixeltex.c \
        points.c \
        polygon.c \
        rastpos.c \
        readpix.c \
-       rect.c \
        scissor.c \
-       shade.c \
-       stages.c \
        state.c \
        stencil.c \
+       texformat.c \
        teximage.c \
        texobj.c \
        texstate.c \
-       texture.c \
+       texstore.c \
        texutil.c \
-       translate.c \
        varray.c \
-       vb.c \
-       vbcull.c \
-       vbfill.c \
-       vbindirect.c \
-       vbrender.c \
-       vbxform.c \
-       vector.c \
-       vertices.c \
+       vtxfmt.c \
        winpos.c \
-       xform.c \
        X86/x86.c \
        X86/common_x86.c \
        X86/3dnow.c \
-       X86/katmai.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 \
+       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 \
        swrast/s_aaline.c \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
@@ -112,6 +134,7 @@ 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 \
@@ -119,20 +142,14 @@ CORE_SOURCES = \
        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_setup/ss_context.c \
-       swrast_setup/ss_triangle.c \
-       swrast_setup/ss_vb.c 
-
-
-
+       swrast/s_zoom.c
 
 
 DRIVER_SOURCES = \
@@ -140,12 +157,10 @@ DRIVER_SOURCES = \
        FX/fxdd.c \
        FX/fxddspan.c \
        FX/fxddtex.c \
-       FX/fxfastpath.c \
-       FX/fxpipeline.c \
        FX/fxsetup.c \
        FX/fxtexman.c \
-       FX/fxtrifuncs.c \
-       FX/fxvsetup.c \
+       FX/fxtris.c \
+       FX/fxvb.c \
        FX/fxglidew.c \
        X/glxapi.c \
        X/fakeglx.c \
@@ -161,22 +176,21 @@ DRIVER_SOURCES = \
        SVGA/svgamesa16.c \
        SVGA/svgamesa24.c \
        SVGA/svgamesa32.c \
-       Trace/tr_2string.c \
-       Trace/tr_attrib.c \
        Trace/tr_context.c \
        Trace/tr_control.c \
        Trace/tr_error.c \
-       Trace/tr_print.c \
-       Trace/tr_wrapper.c
+       Trace/tr_support.c \
+       Trace/tr_wrapper.c \
+       Trace/tr_write.c
 
 
-ASM_SOURCES = 
+ASM_SOURCES =
 
-ADDITIONAL_OBJ = 
+ADDITIONAL_OBJ =
 
 OBJECTS = $(ASM_SOURCES:.S=.o) \
-       $(DRIVER_SOURCES:.c=.o) \
        $(CORE_SOURCES:.c=.o) \
+       $(DRIVER_SOURCES:.c=.o) \
        $(ADDITIONAL_OBJ)
 
 
@@ -263,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 $@
@@ -322,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)