mesa: Branch 'master' - 2 commits

[Brian Paul]

 bin/mklib |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

New commits:
diff-tree 98abd1bbc8351c1fcb7de9fe91129c8a75a66b87 (from a9455bb9a7183b89d550998858e5079a9e07e5aa)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Mar 27 07:58:47 2007 -0600

    simplify .a suffixing

diff --git a/bin/mklib b/bin/mklib
index 2ecabdd..09f4fac 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -212,16 +212,16 @@ case $ARCH in
             # finish up
             FINAL_LIBS="${LIBNAME}"
         elif [ $STATIC = 1 ] ; then
-	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
-            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
+            LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
+            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
             LINK="ar"
             OPTS="-ru"
-            rm -f ${LIBNAME}.a
+            rm -f ${LIBNAME}
             # make lib
-            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
-	    ranlib ${LIBNAME}.a
+            ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
+            ranlib ${LIBNAME}
             # finish up
-            FINAL_LIBS=${LIBNAME}.a
+            FINAL_LIBS=${LIBNAME}
         else
 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
 	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
diff-tree a9455bb9a7183b89d550998858e5079a9e07e5aa (from 63c57a14d3e9419434bb9ee4d0c5c0d64f2e7847)
Author: Bernardo Innocenti <bernie at develer.com>
Date:   Tue Mar 27 07:56:34 2007 -0600

    remove static lib before building to make more bulletproof

diff --git a/bin/mklib b/bin/mklib
index 7d468b1..2ecabdd 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -216,6 +216,7 @@ case $ARCH in
             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
             LINK="ar"
             OPTS="-ru"
+            rm -f ${LIBNAME}.a
             # make lib
             ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
 	    ranlib ${LIBNAME}.a