Mercurial > hg > octave-nkf > gnulib-hg
changeset 7299:d9040941c9dd
Tweak for automake.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 13 Sep 2006 15:00:47 +0000 |
parents | 6948138d9f3a |
children | a0048a859188 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-13 Simon Josefsson <jas@extundo.com> + + * gnulib-tool (func_emit_lib_Makefile_am): Use $(LIBOBJS), not + @LIBOBJS@. + Suggested by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. + 2006-09-10 Bruno Haible <bruno@clisp.org> * modules/mkdtemp (Files): Remove m4/ulonglong.m4, m4/stdint_h.m4,
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-09-09 19:02:08 $' +cvsdatestamp='$Date: 2006-09-13 15:00:47 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -1098,7 +1098,9 @@ fi echo echo "${libname}_${libext}_SOURCES =" - echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@" + # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, + # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. + echo "${libname}_${libext}_LIBADD = \$(${perhapsLT}LIBOBJS)" if test "$libtool" = true; then echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" fi