rearranged order of some functions

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

diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index da5dc4549e3376b539dd65a54d5d7fc654cfde23..8933fb4291285d58b2c39c71ee8ab02e6f3aaf97 100644 (file)
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,8 +1,8 @@
-# $Id: Makefile.X11,v 1.6 1999/10/08 09:27:09 keithw Exp $
+# $Id: Makefile.X11,v 1.17 2000/02/21 23:24:02 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  Brian Paul
+# Version:  3.3
+# Copyright (C) 1995-2000  Brian Paul
 
 # Makefile for core library
 
@@ -18,17 +18,17 @@ VPATH = RCS
 INCDIR = ../include
 LIBDIR = ../lib
 
+
 CORE_SOURCES = \
+       aatriangle.c \
        accum.c \
        alpha.c \
        alphabuf.c \
-       api1.c \
-       api2.c \
-       apiext.c \
        attrib.c \
        bbox.c \
        bitmap.c \
        blend.c \
+       buffers.c \
        clip.c \
        colortab.c \
        config.c \
@@ -37,6 +37,7 @@ CORE_SOURCES = \
        cva.c \
        debug_xform.c \
        depth.c \
+       dispatch.c \
        dlist.c \
        drawpix.c \
        enable.c \
@@ -46,21 +47,24 @@ CORE_SOURCES = \
        feedback.c \
        fog.c \
        get.c \
-       glmisc.c \
+       glapi.c \
+       glapinoop.c \
+       glthread.c \
        hash.c \
+       hint.c \
        image.c \
+       imaging.c \
        light.c \
        lines.c \
        logic.c \
        masking.c \
        matrix.c \
+       mem.c \
        mmath.c \
-       mthreads.c \
        pb.c \
-       pixel.c \
        pipeline.c \
+       pixel.c \
        points.c \
-       pointers.c \
        polygon.c \
        quads.c \
        rastpos.c \
@@ -70,6 +74,7 @@ CORE_SOURCES = \
        shade.c \
        span.c \
        stages.c \
+       state.c \
        stencil.c \
        teximage.c \
        texobj.c \
@@ -91,12 +96,12 @@ CORE_SOURCES = \
        zoom.c \
        X86/x86.c \
        X86/common_x86.c \
-       X86/3dnow.c
+       X86/3dnow.c \
+       X86/katmai.c
 
 DRIVER_SOURCES = \
        X/glxapi.c \
        X/fakeglx.c \
-       X/realglx.c \
        X/xfonts.c \
        X/xmesa1.c \
        X/xmesa2.c \
@@ -104,6 +109,11 @@ DRIVER_SOURCES = \
        X/xmesa4.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 \
@@ -118,8 +128,7 @@ DRIVER_SOURCES = \
        FX/fxtexman.c \
        FX/fxtrifuncs.c \
        FX/fxvsetup.c \
-       FX/fxglidew.c 
-#      GGI/ggimesa.c
+       FX/fxglidew.c
 
 ASM_SOURCES = 
 
@@ -131,21 +140,13 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \
        $(ADDITIONAL_OBJ)
 
 
-#who put these here!?!
-#GL_LIB = libMesaGL.so
-#GLU_LIB = libMesaGLU.so
-#GLUT_LIB = libglut.so
-#CC = gcc
-#INCLUDES=-I. -I../include -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include
-
-
 ##### RULES #####
 
 .c.o:
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 
 .S.o:
-       $(CC) -c $(CFLAGS) $< -o $@
+       $(CC) -c -I. $(CFLAGS) $< -o $@
 
 
 # UGH! These rules shouldn't be needed but IRIX's make (and others?) needs them
@@ -153,8 +154,6 @@ X/glxapi.o: X/glxapi.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X/fakeglx.o: X/fakeglx.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-X/realglx.o: X/realglx.c
-       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X/xfonts.o: X/xfonts.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X/xmesa1.o: X/xmesa1.c
@@ -167,6 +166,16 @@ X/xmesa4.o: X/xmesa4.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 SVGA/svgamesa.o: SVGA/svgamesa.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+SVGA/svgamesa8.o: SVGA/svgamesa8.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+SVGA/svgamesa15.o: SVGA/svgamesa15.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+SVGA/svgamesa16.o: SVGA/svgamesa16.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+SVGA/svgamesa24.o: SVGA/svgamesa24.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+SVGA/svgamesa32.o: SVGA/svgamesa32.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 OSmesa/osmesa.o: OSmesa/osmesa.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 FX/fxapi.o: FX/fxapi.c
@@ -212,7 +221,8 @@ X86/common_x86.o: X86/common_x86.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X86/3dnow.o: X86/3dnow.c
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-
+X86/katmai.o: X86/katmai.c
+       $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 
 ##### TARGETS #####
 
@@ -220,7 +230,8 @@ X86/3dnow.o: X86/3dnow.c
 #      @echo "Specify a target configuration"
 
 clean:
-       -rm *.o *~ */*.o */*~
+       -rm *.o *~ */*.o */*~ *.lo *.la
+       -rm -rf .libs
 
 targets: $(LIBDIR)/$(GL_LIB)