From c9ab99ced1fbfb230b3ccead51eb6c544a39e4fe Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 2 Jun 2003 15:42:23 +0000
Subject: updated rule for make OSMesa lib (Brad King)

---
 src/mesa/main/Makefile.X11 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index af3ae12c8a..d918656c14 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -8,6 +8,7 @@ GL_MINOR = 4
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 GL_LIB_NAME = "GL"  # may be overridden in Make-config
+OSMESA_LIB_NAME = "OSMesa"  # may be overridden in Make-config
 
 VPATH = RCS
 
@@ -231,10 +232,12 @@ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
 
 
 # Make the OSMesa library
-$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
-	if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o OSMesa \
+$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) $(LIBDIR)/$(GL_LIB)
+	if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \
 		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
-		-L$(LIBDIR) -lGL -install $(LIBDIR) $(OSMESA_OBJECTS) ; fi
+		-L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \
+		$(OSMESA_OBJECTS) ; fi
+
 
 # Make an optional library with _just_ core objects
 libmesa:	$(LIBDIR)/$(MESA_LIB)
-- 
cgit v1.2.3