initial rev

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

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 56df7256e3070fe0e6915b26c7533c09d50086a3..1541f722f54cfaaabef4634d98e52f877633c878 100644 (file)
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.2 1999/09/07 21:32:30 brianp Exp $
+# $Id: Makefile.X11,v 1.9 1999/11/18 09:20:51 wertmann Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.1
+# Version:  3.3
 # Copyright (C) 1995-1999  Brian Paul
 
 # Makefile for core library
@@ -9,18 +9,22 @@
 
 ##### MACROS #####
 
+GL_MAJOR = 1
+GL_MINOR = 2
+GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+
 VPATH = RCS
 
 INCDIR = ../include
 LIBDIR = ../lib
 
+
 CORE_SOURCES = \
+       glapi.c \
+       glapinoop.c \
        accum.c \
        alpha.c \
        alphabuf.c \
-       api1.c \
-       api2.c \
-       apiext.c \
        attrib.c \
        bbox.c \
        bitmap.c \
@@ -33,6 +37,7 @@ CORE_SOURCES = \
        cva.c \
        debug_xform.c \
        depth.c \
+       dispatch.c \
        dlist.c \
        drawpix.c \
        enable.c \
@@ -42,21 +47,22 @@ CORE_SOURCES = \
        feedback.c \
        fog.c \
        get.c \
+       glmisc.c \
        hash.c \
        image.c \
+       imaging.c \
        light.c \
        lines.c \
        logic.c \
        masking.c \
        matrix.c \
-       misc.c \
+       mem.c \
        mmath.c \
        mthreads.c \
        pb.c \
        pixel.c \
        pipeline.c \
        points.c \
-       pointers.c \
        polygon.c \
        quads.c \
        rastpos.c \
@@ -87,7 +93,8 @@ 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 \
@@ -127,14 +134,6 @@ 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:
@@ -208,7 +207,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 #####
 
@@ -216,13 +216,14 @@ 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)
 
 # Make the library
 $(LIBDIR)/$(GL_LIB): $(OBJECTS)
-       $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(OBJECTS)
+       $(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS)
        rm -f $(LIBDIR)/$(GL_LIB)*
        mv $(GL_LIB)* $(LIBDIR)