fixed a number of error-test bugs

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

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 790e7881bc30aca46f728cb4f4616bd9e7be5dd9..da5dc4549e3376b539dd65a54d5d7fc654cfde23 100644 (file)
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.3 1999/09/15 15:11:52 brianp Exp $
+# $Id: Makefile.X11,v 1.6 1999/10/08 09:27:09 keithw Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.1
@@ -9,6 +9,10 @@
 
 ##### MACROS #####
 
+GL_MAJOR = 1
+GL_MINOR = 2
+GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+
 VPATH = RCS
 
 INCDIR = ../include
@@ -42,6 +46,7 @@ CORE_SOURCES = \
        feedback.c \
        fog.c \
        get.c \
+       glmisc.c \
        hash.c \
        image.c \
        light.c \
@@ -49,7 +54,6 @@ CORE_SOURCES = \
        logic.c \
        masking.c \
        matrix.c \
-       misc.c \
        mmath.c \
        mthreads.c \
        pb.c \
@@ -222,7 +226,7 @@ targets: $(LIBDIR)/$(GL_LIB)
 
 # Make the library
 $(LIBDIR)/$(GL_LIB): $(OBJECTS)
-       $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS)
+       $(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS)
        rm -f $(LIBDIR)/$(GL_LIB)*
        mv $(GL_LIB)* $(LIBDIR)