]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
authorGary V. Vaughan <gary@gnu.org>
Tue, 12 Oct 2010 03:05:14 +0000 (10:05 +0700)
committerGary V. Vaughan <gary@gnu.org>
Tue, 12 Oct 2010 07:31:38 +0000 (14:31 +0700)
* gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
`libgnu.a' in Makefile.am snippets to be either `$libname.a' or
`$libname.la', depending on whether --libtool/--no-libtool options
were given.

ChangeLog
gnulib-tool

index 8b0f6a51fe399ffd843cf8900e95dcbdef92f77e..c4e22449c03a3190f86adf567562acc130c184e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Gary V. Vaughan  <gary@gnu.org>
+
+       gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
+       * gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
+       `libgnu.a' in Makefile.am snippets to be either `$libname.a' or
+       `$libname.la', depending on whether --libtool/--no-libtool options
+       were given.
+
 2010-10-12  Sam Steingold  <sds@gnu.org>
            Gary V. Vaughan  <gary@gnu.org>
 
index f43b7addb3e43df425cf8a91efeaed2425f264f1..04b4aa22df6becb357610a9fbfadf272b8e5fdf2 100755 (executable)
@@ -2815,6 +2815,11 @@ func_emit_lib_Makefile_am ()
   echo
   uses_subdirs=
   {
+    if test false = "$libtool"; then
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.a,g"
+    else
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.la,g"
+    fi
     for module in $modules; do
       func_verify_nontests_module
       if test -n "$module"; then
@@ -2827,6 +2832,7 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
+               -e "$sed_transform_libgnu_a" \
                 -e "$sed_transform_check_PROGRAMS"
           if test "$module" = 'alloca'; then
             echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"