Merge branch 'am-deps' into micro

* am-deps:
  include: fix bug in handling of user-defined makefile fragments generation
  tests: expose bug in handling of user-defined makefile fragments generation

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

diff --cc NEWS
index f4c835e7a604a4bf0eb8ddcf20220f4dac0b681d,1fae7ad4cb1c534c44f6e1a2529cac930df49b67..a7342978eb42aef4b6c7fda35609f2b0a666aeb1
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -108,18 -108,13 +108,25 @@@ New in 1.14.2
  
  * Bugs fixed:
  
 +  - The expansion of AM_INIT_AUTOMAKE ends once again with a trailing
 +    newline (bug#16841). Regression introduced in Automake 1.14.
 +
 +  - The code used to detect whether the currently used make is GNU make
 +    or not (relying on the private macro 'am__is_gnu_make') no longer
 +    risks causing "Arg list too long" for projects using automatic
 +    dependency tracking and having a ton of source files (bug#18744).
 +
 +  - Automake tries to offer a more deterministic output for generated
 +    Makefiles, in the face of the newly-introduced randomization for
 +    hash keys order in Perl 5.18.
 +
+   - In older Automake versions, if a user defined one single Makefile
+     fragment (say 'foo.am') to be included (via Automake includes) in
+     his main Makefile.am, and defined a custom make rule to generate that
+     file from other data, Automake used to spuriously complain about with
+     something like "... overrides Automake target '$(srcdir)/foo.am".
+     This bug is now fixed.
+ 
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  New in 1.14.1:

diff --cc t/list-of-tests.mk
Simple merge