Merge branch 'maint'

diff --cc ChangeLog
index 531eec421fb7bf4a51bd55bb19da08bba4366372,69286c9bd8fe53903963a42ea38e8b56d16bbcd0..13759a8220e63e8babe72f67722d8b47f79f47f6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,95 -1,16 +1,108 @@@
+ 2010-12-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: fix blunder in example about python extension modules
+       * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
+       not `quaternion_SOURCES', to declare the sources of python
+       extension module `quaternion.la'.
+ 
+ 2010-12-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: list LTLIBRARIES among Automake primaries
+       * doc/automake.texi (Uniform): List `LTLIBRARIES' among
+       the Automake primaries.
+ 
 +2010-12-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Tests defs: requirement 'xsi-shell' must be synced with libtool.
 +      * tests/defs (xsi-shell): Add comment telling to keep the
 +      XSI-conformance checks in sync with libtool.
 +
 +2010-12-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Extend, fix and improve tests on Lex and Yacc support.
 +      * tests/lexcpp.test: New test script, on support for Lex + C++.
 +      * tests/lexvpath.test: New test script, test build and rebuild
 +      rules for lexers in VPATH setup.
 +      * tests/yacc-basic.test: New test script, run simple "semantic"
 +      checks on basic Yacc support (similarly to what lex3.test does
 +      for Lex support).
 +      * tests/lex.test: Don't create useless dummy source file joe.l.
 +      Remove extra blank lines.
 +      * tests/lex4.test: Add trailing `:' command.  Do not create dummy
 +      useless lex source file.
 +      * tests/lex2.test: Likewise.  Call automake with the `-a' option,
 +      so that it doesn't fail for the absence of `ylwrap' script.  Make
 +      grepping of automake stderr stricter.
 +      * tests/yacc7.test: Add trailing `:' command.  Enable `errexit'
 +      shell flag earlier (just after having sourced ./defs).
 +      * tests/yacc4.test: Likewise.  Also ...
 +      (configure.in): Use pre-populated skeleton set up by ./defs,
 +      instead of writing one from scratch.
 +      Other minor cosmetic changes.
 +      * tests/yacc5.test: Likewise.
 +      * tests/yaccvpath.test: Likewise. Also ...
 +      ($distdir): New variable.
 +      Use it throughout.
 +      * tests/lex5.test: Likewise.
 +      * tests/lex3.test: Likewise.  Check the distdir, rather than
 +      grepping the distribution tarball.  Extend the test on the
 +      created binary, and be sure to avoid hangs.  Add some comments.
 +      * tests/yacc.test: Use stricter grepping.  Add trailing `:'.
 +      * tests/yacc6.test: Likewise.
 +      * tests/yacc3.test: Likewise.  Do not create the unused file
 +      `Makefile.sed'.  Remove useless rules from Makefile.am.  Other
 +      minor cosmetic changes.
 +      * tests/yacc2.test: Make grepping of generated `Makefile.in' and
 +      of automake error messages stricter.  Do not redirect output of
 +      grep to /dev/null.  Move call to aclocal earlier.  Reduce the
 +      number of empty blank lines.  Fix a typo in comments.
 +      * tests/yacc8.test: Fixed bugs that reduced the completeness of
 +      the tests.  Added trailing `:' command.
 +      (configure.in): Use pre-populated skeleton set up by ./defs,
 +      instead of writing one from scratch.
 +      * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
 +      `.yxx', rather than only `.yy'.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2010-12-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Minor cleanups in canon7.test.
 +      * tests/canon7.test (_foo_bar_SOURCES): Remove libs.c.
 +      (configure.in): Remove AC_PROG_CXX.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Avoid false positive in sc_tests_plain_make maintainer-check.
 +      * Makefile.am (sc_tests_plain_make): Ensure to only match full
 +      `make' words.  Avoid false positive with remake11.test.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix canon7.test failure.
 +      * tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
 +      (lib.h, libd.c, libs.c): Use const for constant strings.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix typos in test comments.
 +      * tests/posixsubst-data.test, tests/posixsubst-extradist.test,
 +      tests/posixsubst-ldadd.test, tests/posixsubst-libraries.test,
 +      tests/posixsubst-ltlibraries.test, tests/posixsubst-programs.test,
 +      tests/posixsubst-scripts.test, tests/posixsubst-sources.test,
 +      tests/posixsubst-tests.test: Fix typos.
 +
 +2010-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      More uses of AS_HELP_STRING in automake macros.
 +      * m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
 +      the help message added to the generated configure.
 +      * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
 +      * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
 +      * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
 +      * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
 +      Also, bumped all serial numbers of the modified m4 files.
 +
  2010-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Improve tests on generated portions of configure help screen.

diff --cc doc/automake.texi
Simple merge