From: Gary V. Vaughan Date: Tue, 12 Oct 2010 03:05:14 +0000 (+0700) Subject: gnulib-tool: transform hard-coded libgnu.a to $libname.l?a X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e5874baab3a6fa6fec4d3733637d16755259aeab;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 8b0f6a51fe..c4e22449c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-10-12 Gary V. Vaughan + + 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 Gary V. Vaughan diff --git a/gnulib-tool b/gnulib-tool index f43b7addb3..04b4aa22df 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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@"