Mercurial > hg > octave-nkf > gnulib-hg
changeset 14099:888c4683d9aa
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.
| author | Gary V. Vaughan <gary@gnu.org> |
|---|---|
| date | Tue, 12 Oct 2010 10:05:14 +0700 |
| parents | 25daaadfa3d0 |
| children | 85f15823ff38 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- a/gnulib-tool +++ b/gnulib-tool @@ -2815,6 +2815,11 @@ 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 @@ -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@"