From d14579d4c5dcc7ddcb296748d9478d75c178d081 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 13 Sep 2006 15:00:47 +0000 Subject: [PATCH] Tweak for automake. --- ChangeLog | 6 ++++++ gnulib-tool | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee877afd18..e4c19c3dc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-13 Simon Josefsson + + * gnulib-tool (func_emit_lib_Makefile_am): Use $(LIBOBJS), not + @LIBOBJS@. + Suggested by Ralf Wildenhues . + 2006-09-10 Bruno Haible * modules/mkdtemp (Files): Remove m4/ulonglong.m4, m4/stdint_h.m4, diff --git a/gnulib-tool b/gnulib-tool index 5b44ee09f6..ffab065be9 100755 --- 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 @@ func_emit_lib_Makefile_am () 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 -- 2.30.2