Merge branch 'micro' into minor

diff --cc NEWS
index 602b1a25844538439f9eaf163e1937f9d53632a3,92be906347310edf2d55ef9039b46e2341591482..eb0a4155dd5959296098169f500f6c4ad089a82e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -62,57 -62,8 +62,57 @@@
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
- New in 1.16:
+ New in ?.?.?:
  
 +* Miscellaneous changes
 +
 +  - When subdir-objects is in effect, Automake will now construct
 +    shorter object file names when no programs and libraries name
 +    clashes are encountered.  This should make the discouraged use of
 +    'foo_SHORTNAME' unnecessary in many cases.
 +
 +* Bugs fixed:
 +
 +  - Automatic dependency tracking has been fixed to work also when the
 +    'subdir-object' option is used and some 'foo_SOURCES' definition
 +    contains unexpanded references to make variables, as in, e.g.:
 +
 +        a_src = sources/libs/aaa
 +        b_src = sources/bbb
 +        foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c
 +
 +    With such a setup, the created makefile fragment containing dependency
 +    tracking information will be correctly placed under the directories
 +    named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
 +    mistakenly under directories named (literally!) '$(src_a)/.deps' and
 +    '$(src_b)/.deps' (this was the first part of automake bug#13928).
 +
 +    Notice that in order to fix this bug we had to slightly change the
 +    semantics of how config.status bootstraps the makefile fragments
 +    required for the dependency tracking to work: rather than attempting
 +    to parse the Makefiles via grep and sed trickeries only, we actually
 +    invoke 'make' on a slightly preprocessed version of those Makefiles,
 +    using a private target that is only meant to bootstrap the required
 +    makefile fragments.
 +
 +  - The 'subdir-object' option no longer causes object files corresponding
 +    to source files specified with an explicit '$(srcdir)' component to be
 +    placed in the source tree rather than in the build tree.
 +
 +    For example, if Makefile.am contains:
 +
 +        AUTOMAKE_OPTIONS = subdir-objects
 +        foo_SOURCES = $(srcdir)/foo.c $(srcdir)/s/bar.c $(top_srcdir)/baz.c
 +
 +    then "make all" will create 'foo.o' and 's/bar.o' in $(builddir) rather
 +    than in $(srcdir), and will create 'baz.o' in $(top_builddir) rather
 +    than in $(top_srcdir).
 +
 +    This was the second part of automake bug#13928.
 +
 +  - Installed 'aclocal' m4 macros can now accept installation directories
 +    containing '@' characters (automake bug#20903)
 +
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  New in 1.15.1: