removed unused var

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

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index f3f97af3031b49c68c8e8d8c959eced95b82e691..533e0c32d9509717950b5252b43fbe9c367b8028 100644 (file)
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.24 2000/09/26 20:53:53 brianp Exp $
+# $Id: Makefile.X11,v 1.32 2000/11/11 19:09:29 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -19,11 +19,10 @@ INCDIR = ../include
 LIBDIR = ../lib
 
 
+
 CORE_SOURCES = \
-       aatriangle.c \
        accum.c \
        alpha.c \
-       alphabuf.c \
        attrib.c \
        bbox.c \
        bitmap.c \
@@ -52,30 +51,29 @@ CORE_SOURCES = \
        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 \
-       pb.c \
        pipeline.c \
        pixel.c \
        pixeltex.c \
        points.c \
        polygon.c \
-       quads.c \
        rastpos.c \
        readpix.c \
        rect.c \
        scissor.c \
        shade.c \
-       span.c \
        stages.c \
        state.c \
        stencil.c \
@@ -85,7 +83,6 @@ CORE_SOURCES = \
        texture.c \
        texutil.c \
        translate.c \
-       triangle.c \
        varray.c \
        vb.c \
        vbcull.c \
@@ -97,13 +94,59 @@ CORE_SOURCES = \
        vertices.c \
        winpos.c \
        xform.c \
-       zoom.c \
        X86/x86.c \
        X86/common_x86.c \
        X86/3dnow.c \
-       X86/katmai.c
+       X86/katmai.c \
+       swrast/s_aaline.c \
+       swrast/s_aatriangle.c \
+       swrast/s_accum.c \
+       swrast/s_alpha.c \
+       swrast/s_alphabuf.c \
+       swrast/s_bitmap.c \
+       swrast/s_blend.c \
+       swrast/s_buffers.c \
+       swrast/s_copypix.c \
+       swrast/s_context.c \
+       swrast/s_depth.c \
+       swrast/s_drawpix.c \
+       swrast/s_feedback.c \
+       swrast/s_fog.c \
+       swrast/s_histogram.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_triangle.c \
+       swrast/s_zoom.c \
+       swrast_setup/ss_context.c \
+       swrast_setup/ss_triangle.c \
+       swrast_setup/ss_vb.c 
+
+
+
+
 
 DRIVER_SOURCES = \
+       FX/fxapi.c \
+       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/fxglidew.c \
        X/glxapi.c \
        X/fakeglx.c \
        X/xfonts.c \
@@ -112,35 +155,18 @@ DRIVER_SOURCES = \
        X/xm_line.c \
        X/xm_span.c \
        X/xm_tri.c \
-       OSmesa/osmesa.c \
        SVGA/svgamesa.c \
        SVGA/svgamesa8.c \
        SVGA/svgamesa15.c \
        SVGA/svgamesa16.c \
        SVGA/svgamesa24.c \
        SVGA/svgamesa32.c \
-       FX/fxapi.c \
-       FX/fxclip.c \
-       FX/fxcva.c \
-       FX/fxdd.c \
-       FX/fxddspan.c \
-       FX/fxddtex.c \
-       FX/fxfastpath.c \
-       FX/fxpipeline.c \
-       FX/fxrender.c \
-       FX/fxsanity.c \
-       FX/fxsetup.c \
-       FX/fxtexman.c \
-       FX/fxtrifuncs.c \
-       FX/fxvsetup.c \
-       FX/fxglidew.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 = 
@@ -148,11 +174,16 @@ ASM_SOURCES =
 ADDITIONAL_OBJ = 
 
 OBJECTS = $(ASM_SOURCES:.S=.o) \
-       $(CORE_SOURCES:.c=.o) \
        $(DRIVER_SOURCES:.c=.o) \
+       $(CORE_SOURCES:.c=.o) \
        $(ADDITIONAL_OBJ)
 
 
+OSMESA_SOURCES = OSmesa/osmesa.c
+OSMESA_OBJECTS = OSmesa/osmesa.o
+
+
+
 ##### RULES #####
 
 .c.o:
@@ -200,8 +231,6 @@ FX/fxapi.o: FX/fxapi.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 FX/fxclip.o: FX/fxclip.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-FX/fxcva.o: FX/fxcva.c
-       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 FX/fxdd.o: FX/fxdd.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 FX/fxddspan.o: FX/fxddspan.c
@@ -267,15 +296,22 @@ clean:
        -rm *.o *~ */*.o */*~ *.lo *.la
        -rm -rf .libs
 
-targets: $(LIBDIR)/$(GL_LIB)
+targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
 
-# Make the library
+# Make the GL library
 $(LIBDIR)/$(GL_LIB): $(OBJECTS)
        $(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS)
        rm -f $(LIBDIR)/$(GL_LIB)*
        mv $(GL_LIB)* $(LIBDIR)
 
 
+# Make the OSMesa library
+$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
+       if [ ${OSMESA_LIB} ] ; then $(MAKELIB) $(OSMESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(OSMESA_OBJECTS) ; fi
+       if [ ${OSMESA_LIB} ] ; then rm -f $(LIBDIR)/$(OSMESA_LIB)* ; fi
+       if [ ${OSMESA_LIB} ] ; then mv $(OSMESA_LIB)* $(LIBDIR) ; fi
+
+
 include ../Make-config
 
 include depend
@@ -286,8 +322,8 @@ include depend
 # Run 'make dep' to update the dependencies if you change what's included
 # by any source file.
 # 
-dep: $(CORE_SOURCES) $(DRIVER_SOURCES)
-       makedepend -fdepend -Y -I../include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES)
+dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
+       makedepend -fdepend -Y -I../include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
 
 tags:
        etags `find . -name \*.[ch]` `find ../include`