From 3ba8a49c810d5976c705160e8c96ae682ab85250 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sun, 1 Jun 2003 16:25:02 +0000
Subject: Remove a bunch of really old/obsolete configs. Use the new mklib
 script.

---
 src/mesa/main/Makefile.X11 | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

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`
-- 
cgit v1.2.3