Merge branch 'maint' into ng/master

* maint:
  am: prefer a shorter idiom where possible
  cosmetics: fix few typos, grammaros and missing whitespace
  fixup: remove an obsolete comment
  docs: we still don't have the promised better Java interface
  maint: re-run "make update-copyright" ...
  tests: avoid spurious failure with older flex (2.5.4)
  announcement: cater to more flexible NEWS format

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

diff --cc doc/automake-ng.texi
Simple merge

diff --cc lib/am/library.am
index c7eae862c07c4a1b9e4d0bea53e7bc01cab45a7b,c01d221ef63c387eaa81fd8a4c9dfe87c553b1af..bf260efdfed2b32d6ffc5ea11d2d6aebdedd0285
--- 1/lib/am/library.am
--- 2/lib/am/library.am
+++ b/lib/am/library.am
@@@ -13,9 -13,8 +13,10 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
 -      %SILENT%-rm -f %LIBRARY%
 -      %VERBOSE%$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
 -      %SILENT%$(RANLIB) %LIBRARY%
+ 
 +%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) \
 +           $(EXTRA_%XLIBRARY%_DEPENDENCIES)
 +      %SILENT%rm -f $@
 +      %SILENT%$(am.cmd.ensure-target-dir-exists)
 +      %VERBOSE%$(%XLIBRARY%_AR) $@ $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
 +      %SILENT%$(RANLIB) $@

diff --cc lib/am/ltlibrary.am
index 49c646a171e71ce9f9bcaec5f69ee29372b4c9b5,642d032ba8f988341f30335793e9c3e0ece9ed7e..e036779f1e22f9eb749d370a7844d859dfa16be0
--- 1/lib/am/ltlibrary.am
--- 2/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@@ -13,7 -13,6 +13,8 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
+ 
 +%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) \
 +             $(EXTRA_%XLTLIBRARY%_DEPENDENCIES)
 +      %SILENT%$(am.cmd.ensure-target-dir-exists)
        %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)

diff --cc lib/am/program.am
index de4ca2068809e77c54ace7c0bcd260566138fd77,131c4a9c60e03ee3ac150ea08417bcad221094db..446fbce83ddc6db1c1f6ae9edfacd1805b6e9ba0
--- 1/lib/am/program.am
--- 2/lib/am/program.am
+++ b/lib/am/program.am
@@@ -13,8 -13,8 +13,9 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
+ 
 +%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) \
 +                   $(EXTRA_%XPROGRAM%_DEPENDENCIES)
  ## Remove program before linking.  Otherwise the link will fail if the
  ## program is running somewhere.  FIXME: this could be a loss if
  ## you're using an incremental linker.  Maybe we should think twice?

diff --cc maintainer/maint.mk
Simple merge