Tweak for automake.

diff --git a/ChangeLog b/ChangeLog
index ee877afd1833b39f58295d55685f46b2d120e60f..e4c19c3dc54979b19d4f0ec95aaa5215d71e848b 100644 (file)
--- 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,

diff --git a/gnulib-tool b/gnulib-tool
index 5b44ee09f6178f7b10b90eab119dc1d0d05baec4..ffab065be9221b088e7294b3805140f1605d986d 100755 (executable)
--- 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