Added GL_LIB_NAME / GLU_LIB_NAME so the default name for the libraries

can be overridden (Brad King).

diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index c16464f..3ba1570 100644 (file)
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -6,6 +6,8 @@ GLU_MAJOR = 1
 GLU_MINOR = 1
 GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
+GLU_LIB_NAME = "GLU"  # may be overridden in Make-config
+
 VPATH = RCS
 
 TOP = ..
@@ -38,9 +40,9 @@ targets: $(LIBDIR)/$(GLU_LIB)
 
 # Make the library:
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-       $(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-               -patch $(GLU_TINY) $(GLU_LIB_DEPS) -install $(LIBDIR) \
-               $(OBJECTS)
+       $(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
+               -minor $(GLU_MINOR) -patch $(GLU_TINY) $(GLU_LIB_DEPS) \
+               -install $(LIBDIR) $(OBJECTS)
 
 include $(TOP)/Make-config
 

diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 2925d6e..9c79d0d 100644 (file)
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -8,6 +8,8 @@ GLU_MAJOR = 1
 GLU_MINOR = 3
 GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
+GLU_LIB_NAME = "GLU"  # may be overridden in Make-config
+
 VPATH = RCS
 
 TOP = ..
@@ -138,9 +140,9 @@ targets: $(LIBDIR)/$(GLU_LIB)
 
 # Make the library:
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-       $(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-               -patch $(GLU_TINY) $(GLU_LIB_DEPS) -cplusplus \
-               -install $(LIBDIR) $(OBJECTS)
+       $(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
+               -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+               $(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) $(OBJECTS)
 
 
 

diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index ce71d9b..af3ae12 100644 (file)
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -7,6 +7,8 @@ GL_MAJOR = 1
 GL_MINOR = 4
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
+GL_LIB_NAME = "GL"  # may be overridden in Make-config
+
 VPATH = RCS
 
 TOP = ..
@@ -223,8 +225,9 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
 
 # Make the GL library
 $(LIBDIR)/$(GL_LIB): $(OBJECTS)
-       $(TOP)/bin/mklib -o GL -major $(GL_MAJOR) -minor $(GL_MINOR) \
-               -patch $(GL_TINY) -install $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
+       $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
+               -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
+               $(GL_LIB_DEPS) $(OBJECTS)
 
 
 # Make the OSMesa library