From 158a2aa488a0bab82381ec2c6eedd2b5bb7202ca Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 6 Sep 2005 03:02:01 +0000
Subject: [PATCH] Use mklib script instead of ar.  Make libmesa.a instead of
 mesa.a

---
 src/mesa/Makefile                      | 11 +++++------
 src/mesa/drivers/dri/Makefile.template |  2 +-
 src/mesa/drivers/dri/x11/Makefile      |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b6c0b85f421..9b0a21239fd 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -38,7 +38,7 @@ default:
 	fi
 
 # BeOS driver target
-beos: depend subdirs mesa.a
+beos: depend subdirs libmesa.a
 	cd drivers/beos; $(MAKE)
 
 
@@ -64,13 +64,12 @@ SOLO_C_SOURCES = \
 SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
 		$(ASM_SOURCES:.S=.o)
 
-linux-solo: depend subdirs mesa.a drivers-dri
+linux-solo: depend subdirs libmesa.a drivers-dri
 
 # Make archive of core object files
-mesa.a:	$(SOLO_OBJECTS)
+libmesa.a: $(SOLO_OBJECTS)
 	rm -f $@
-	ar rcv $@ $(SOLO_OBJECTS)
-	ranlib $@
+	@ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);
 	@if [ "${CONFIG_NAME}" = "beos" ] ; then \
 		mimeset -f "$@" ; \
 	fi
@@ -221,7 +220,7 @@ tags:
 clean:
 	-rm -f */*.o
 	-rm -f */*/*.o
-	-rm -f depend depend.bak mesa.a
+	-rm -f depend depend.bak libmesa.a
 	-rm -f drivers/*/*.o
 	(cd drivers/dri ; $(MAKE) clean)
 	(cd x86 ; $(MAKE) clean)
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 9e22f9e82ec..ba7cdcea921 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
+MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
 COMMON_SOURCES = \
         ../../common/driverfuncs.c \
diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index c7dd1520953..3b72a77d1f3 100644
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -39,7 +39,7 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/swrast_setup
 
 # Core Mesa objects
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
+MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
 # Libraries that the driver shared lib depends on
 LIB_DEPS = -lm -lpthread -lc
-- 
2.30.2