Remove a bunch of really old/obsolete configs.

Use the new mklib script.

3 files changed, 33 insertions, 46 deletions

diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index e8a4e18c42..c16464fe9f 100644
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -1,11 +1,4 @@
-# $Id: Makefile.X11,v 1.8 2000/07/11 14:11:04 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.3
-# Copyright (C) 1995-2000  Brian Paul
-
-# Makefile for GLU library
-
+# Makefile for old Mesa GLU library
 
 ##### MACROS #####
 
@@ -15,8 +8,9 @@ GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
 
 SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
 	polytest.c project.c quadric.c tess.c tesselat.c
@@ -44,10 +38,11 @@ targets: $(LIBDIR)/$(GLU_LIB)
 
 # Make the library:
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-	$(MAKELIB) $(GLU_LIB) $(GLU_MAJOR) $(GLU_MINOR) $(GLU_TINY) $(OBJECTS)
-	mv $(GLU_LIB)* $(LIBDIR)
+	$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
+		-patch $(GLU_TINY) $(GLU_LIB_DEPS) -install $(LIBDIR) \
+		$(OBJECTS)
 
-include ../Make-config
+include $(TOP)/Make-config
 
 include depend
 
@@ -58,4 +53,4 @@ include depend
 # by any source file.
 # 
 dep: $(SOURCES)
-	makedepend -fdepend -Y -I../include $(SOURCES)
+	makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 5481b508c7..2925d6eaa2 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -1,9 +1,3 @@
-# $Id: Makefile.X11,v 1.7 2002/01/08 15:58:32 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  4.1
-# Copyright (C) 1995-2002  Brian Paul
-
 # Makefile for SGI SI GLU library
 
 .SUFFIXES : .cc
@@ -16,8 +10,9 @@ GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
 
-INCDIRS = -I../include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
-LIBDIR = ../lib
+TOP = ..
+INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
+LIBDIR = $(TOP)/lib
 
 C_SOURCES = \
 	libutil/error.c		\
@@ -125,7 +120,7 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
 	$(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
 
 .cc.o:
-	$(CPLUSPLUS) -c $(INCDIRS) $(CCFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
+	$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
 
 
 ##### TARGETS #####
@@ -143,11 +138,13 @@ targets: $(LIBDIR)/$(GLU_LIB)
 
 # Make the library:
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-	$(MAKELIB) $(GLU_LIB) $(GLU_MAJOR) $(GLU_MINOR) $(GLU_TINY) $(OBJECTS)
-	rm -f $(LIBDIR)/$(GLU_LIB)*
-	mv $(GLU_LIB)* $(LIBDIR)
+	$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
+		-patch $(GLU_TINY) $(GLU_LIB_DEPS) -cplusplus \
+		-install $(LIBDIR) $(OBJECTS)
+
+
 
-include ../Make-config
+include $(TOP)/Make-config
 
 include depend
 
@@ -158,4 +155,4 @@ include depend
 # by any source file.
 #
 dep: $(SOURCES)
-	makedepend -fdepend -Y -I../include $(SOURCES)
+	makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 6300b601a1..499bbb5119 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,10 +1,4 @@
-# $Id: Makefile.X11,v 1.79 2003/04/17 02:33:11 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  5.1
-# Copyright (C) 1995-2003  Brian Paul
-
-# Makefile for core library
+# Makefile for GL library
 
 
 ##### MACROS #####
@@ -15,8 +9,9 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
 
 
 
@@ -45,6 +40,7 @@ CORE_SOURCES = \
 	eval.c \
 	extensions.c \
 	feedback.c \
+	fetchstate.c \
 	fog.c \
 	get.c \
 	glapi.c \
@@ -228,16 +224,15 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
 
 # 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)
+	$(TOP)/bin/mklib -o GL -major $(GL_MAJOR) -minor $(GL_MINOR) \
+		-patch $(GL_TINY) -install $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
 # 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
+	if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o OSMesa \
+		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
+		-L$(LIBDIR) -lGL -install $(LIBDIR) $(OSMESA_OBJECTS) ; fi
 
 # Make an optional library with _just_ core objects
 libmesa:	$(LIBDIR)/$(MESA_LIB)
@@ -247,7 +242,7 @@ libmesa:	$(LIBDIR)/$(MESA_LIB)
 
 $(LIBDIR)/$(MESA_LIB):	$(CORE_OBJECTS)
 
-include ../Make-config
+include $(TOP)/Make-config
 
 include depend
 
@@ -258,7 +253,7 @@ include depend
 # 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)
+	makedepend -fdepend -Y -I$(TOP)/include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
 
 tags:
-	etags `find . -name \*.[ch]` `find ../include`
+	etags `find . -name \*.[ch]` `find $(TOP)/include`