Avoid unnecessary diffs in the generated lib/Makefile.am.

diff --git a/ChangeLog b/ChangeLog
index 815204630bc42b616385f3f652c4e2903f22a412..67a23c7bff553b51380b764b44504f3e889f5a43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-30  Bruno Haible  <bruno@clisp.org>
+
+       Avoid unnecessary diffs in the generated lib/Makefile.am.
+       * gnulib-tool (func_emit_lib_Makefile_am): Don't write the cmd into
+       the generated files.
+       (func_import): Don't set cmd.
+
 2005-08-30  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_import): Read the previous cached settings

diff --git a/gnulib-tool b/gnulib-tool
index 1ede05c74c0342e98094a49a7dc70577af5de399..b043a9618c1c24c92321986b32f0d6d10d6e4c94 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-08-31 20:54:49 $'
+cvsdatestamp='$Date: 2005-08-31 20:55:19 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -603,7 +603,6 @@ func_modules_to_filelist ()
 # - modules         list of modules, including dependencies
 # - libname         library name
 # - libtool         true if libtool will be used, blank otherwise
-# - cmd             (optional) command that led to this invocation
 # - actioncmd       (optional) command that will reproduce this invocation
 func_emit_lib_Makefile_am ()
 {
@@ -624,9 +623,6 @@ func_emit_lib_Makefile_am ()
   echo "# the same distribution terms as the rest of that program."
   echo "#"
   echo "# Generated by gnulib-tool."
-  if test -n "$cmd"; then
-    echo "# Invoked as: $cmd"
-  fi
   if test -n "$actioncmd"; then
     echo "# Reproduce by: $actioncmd"
   fi
@@ -753,7 +749,6 @@ func_emit_tests_Makefile_am ()
 # - macro_prefix    prefix of gl_EARLY, gl_INIT macros to use
 # - dry_run         true if actions shall only be printed, blank otherwise
 # - symbolic        true if files should be symlinked, copied otherwise
-# - supplied_opts   all options passed to gnulib-tool
 func_import ()
 {
   # Get the cached settings.
@@ -988,9 +983,6 @@ func_import ()
     fi
   done
 
-  # Command-line invocation printed in various files.
-  cmd="gnulib-tool $supplied_opts"
-
   # Command-line invocation printed in a comment in generated gnulib-cache.m4.
   actioncmd="gnulib-tool --import"
   actioncmd="$actioncmd --dir=$destdir"