Merge branch 'tests-remake-extend'

* tests-remake-extend:
  Avoid false positive in sc_tests_plain_make maintainer-check.

diff --cc ChangeLog
index 5be64f5141ea8a7635117e1592f1a7fa6023823b,7b73d0a313115eb9bcf10dd3f4d314e87cc270ab..c238614f35fbb2ed7ea7ba13193ee2ebfedac0b1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,68 -1,9 +1,74 @@@
+ 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.
 +      * tests/help-depend.test: Grepping of configure help screen
 +      relaxed to cater for possible line wrapping, and tightened in
 +      other respects.
 +      * tests/help-depend2.test: Likewise.
 +      * tests/help-dmalloc.test: Likewise.
 +      * tests/help-lispdir.test: Likewise.
 +      * tests/help-maintainer.test: Likewise.
 +      * tests/help-multilib.test: Likewise.
 +      * tests/help-silent.test: Likewise.
 +      * tests/help-upc.test: Likewise.
 +      * tests/help-init.test: Grepping of configure help screen
 +      tightened.
 +
 +2010-12-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Extended tests on AC_CONFIG_AUX_DIR.
 +      * tests/auxdir.test: Enable `errexit' shell flag.  Prefer `$me'
 +      over hard-coded test name.  Use proper m4 quoting.  Add trailing
 +      `:' command.
 +      * tests/auxdir2.test: Likewise.  Try to call automake also with
 +      the `-a' option, so that it will not fail for spurious reasons.
 +      * tests/auxdir3.test: Add an explanatory comment and a trailing
 +      `:' command.
 +      * tests/auxdir4.test: Prefer `$me' over hard-coded test name.
 +      Make grepping of automake stderr slightly stricter.  Also, now
 +      this test just checks about Automake's reaction to unportable
 +      auxiliary directory names (and it has been extended in this
 +      respect).  Moved the checks about non-existent auxiliary
 +      directories to ...
 +      * tests/auxdir5.test: ... this new test.
 +      * tests/auxdir6.test: New test.
 +      * tests/auxdir7.test: Likewise.
 +      * tests/auxdir8.test: Likewise.
 +      * tests/auxdir9.test: Likewise.
 +      * tests/Makefile.am (TESTS): Updated.
 +
  2010-12-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Tests: extend checks on remake rules.

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge