From 77b47bb27bb8f36d2b0980ed78175d859a7d2bed Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 25 Mar 2004 21:17:48 +0000
Subject: re-order arguments to mklib

---
 src/glu/sgi/Makefile.X11  | 4 ++--
 src/glut/glx/Makefile.X11 | 4 ++--
 src/glw/Makefile.X11      | 4 ++--
 src/mesa/Makefile.X11     | 7 +++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 5102528585f..77b905d33ca 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -142,8 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB)
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
 		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
-		$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
-		$(MKLIB_OPTIONS) $(OBJECTS)
+		$(MKLIB_OPTIONS) -cplusplus -install $(LIBDIR) \
+		$(GLU_LIB_DEPS) $(OBJECTS)
 
 
 
diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11
index 89b920bea9e..bce0d206841 100644
--- a/src/glut/glx/Makefile.X11
+++ b/src/glut/glx/Makefile.X11
@@ -102,8 +102,8 @@ targets: $(LIBDIR)/$(GLUT_LIB)
 # Make the library
 $(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-		-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
-		$(MKLIB_OPTIONS) $(OBJECTS)
+		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+		$(GLUT_LIB_DEPS) $(OBJECTS)
 
 include $(TOP)/Make-config
 
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index b38ef50d4c7..d7513ffb5aa 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -46,8 +46,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
 # Make the library
 $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
-		-patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
-		$(MKLIB_OPTIONS) $(OBJECTS)
+		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+		$(GLW_LIB_DEPS) $(OBJECTS)
 
 
 message:
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index c4def104858..22708b5efa2 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -105,10 +105,9 @@ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
 $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
 	if [ ${OSMESA_LIB} ] ; then \
 		$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
-			-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
-			-l$(GL_LIB_NAME) $(OSMESA_LIB_DEPS) \
-			-install $(LIBDIR) \
-			$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
+			-minor $(MESA_MINOR) -patch $(GL_TINY) \
+			$(MKLIB_OPTIONS) -install $(LIBDIR) \
+			$(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \
 	fi
 
 
-- 
cgit v1.2.3