From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 22 Jun 2012 22:32:30 +0000 (+0200)
Subject: Merge branch 'missing-not-touch-just-warn'
X-Git-Tag: v1.12b~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9465eb2651d9af30519882c4b583acc8ce91b8bb;p=thirdparty%2Fautomake.git

Merge branch 'missing-not-touch-just-warn'

* missing-not-touch-just-warn:
  missing: do not touch timestamps; only warn for out-of-date files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

9465eb2651d9af30519882c4b583acc8ce91b8bb
diff --cc NEWS
index 6df5fcdd8,2239f3046..54acc7a5c
--- a/NEWS
+++ b/NEWS
@@@ -59,13 -56,21 +59,28 @@@ New in 1.13
      backward-compatibility only.  In particular, its use does not disable
      the warnings in the 'portability-recursive' category anymore.
  
 +* Texinfo Support:
 +
 +  - The rules to build PDF and DVI files from Texinfo input now use the
 +    ' --build-dir' option, to keep the auxiliary files used by texi2dvi
 +    and texi2pdf around without cluttering the build directory, and to
 +    make it possible to run the "dvi" and "pdf" recipes in parallel.
 +
+ * Automatic remake rules and 'missing' script:
+ 
+   - The 'missing' script does not try anymore to update the timestamp
+     of out-of-date files that require a maintainer-specific tool to be
+     remade, in case the user lacks such a tool (or has a too-old version
+     of it).  It just give a useful warning, and in some cases also a tip
+     about how to obtain such a tool.
+ 
+   - The missing script has thus become useless as a (poor) way to work
+     around the sketched-timestamps issues that can happen for projects
+     that keep generated files committed in their VCS repository.  Such
+     projects are now encouraged to write a custom "fix-timestamps.sh"
+     script to avoid such issues; a simple example is provided in the
+     "CVS and generated files" chapter of the automake manual.
+ 
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  New in 1.12.2:
diff --cc t/remake6.sh
index b6a3340e9,0fc7ead66..b5e9646f1
--- a/t/remake6.sh
+++ b/t/remake6.sh
@@@ -35,13 -35,6 +35,13 @@@ $AUTOCON
  ./configure
  $MAKE
  
 +do_check ()
 +{
 +  $MAKE >stdout || { cat stdout; Exit 1; }
 +  cat stdout
-   test $(grep -c " --run " stdout) -eq 1
++  test $(grep -c "/missing " stdout) -eq 1
 +}
 +
  # Now, we are set up.  Ensure that, for either missing Makefile.in,
  # or updated Makefile.am, rebuild rules are run, and run exactly once
  # only.