Mercurial > hg > octave-nkf > gnulib-hg
changeset 7182:f03a51e31a89
Make it possible to use lib_LTLIBRARIES in a snippet.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 22 Aug 2006 18:57:52 +0000 |
| parents | 1090c1338506 |
| children | 27412cb989c5 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-22 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_emit_lib_Makefile_am): Don't treat lib_LIBRARIES + and lib_LTLIBRARIES like the other lib_* variables. + 2006-08-22 Paul Eggert <eggert@cs.ucla.edu> Avoid the need for AC_LIBSOURCES in m4 macros. @@ -146,8 +151,8 @@ 2006-08-21 Bruno Haible <bruno@clisp.org> * gnulib-tool (func_emit_lib_Makefile_am): If the snippets already - specify an installation location, don't emit a noinst_[LT]LIBRARIES - assignment. + specify an installation location, don't emit a noinst_LIBRARIES or + noinst_LTLIBRARIES assignment. 2006-08-19 Bruno Haible <bruno@clisp.org>
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-08-21 18:49:51 $' +cvsdatestamp='$Date: 2006-08-22 18:57:52 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -904,7 +904,11 @@ if test -n "$module"; then { func_get_automake_snippet "$module" | - sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' + sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ + -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' | + sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | + sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' if test "$module" = 'alloca'; then echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" fi