[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-530-gb2e3780

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=b2e378017346e52a0c0a810fcc2212b0d551b414

The branch, master has been updated
       via  b2e378017346e52a0c0a810fcc2212b0d551b414 (commit)
       via  ed75689e10bfa552c0408754d1b8dde40aa707aa (commit)
       via  488a4f236145085ad98e0e06d7b1bd823be8a8ca (commit)
       via  fb7f5039ab30dace3e73aaac9e2af62926660da1 (commit)
       via  057566d8f0da573e10910c8b5f740e7f8594bcf2 (commit)
       via  c65a679d59426c17fba6e4d2e49f8dabef2b9f26 (commit)
      from  d7d84c92014b480bc8ba11d082efe6131c68d629 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2e378017346e52a0c0a810fcc2212b0d551b414
Merge: 488a4f2 ed75689
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:58:56 2010 +0100

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

commit ed75689e10bfa552c0408754d1b8dde40aa707aa
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:58:21 2010 +0100

    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.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 488a4f236145085ad98e0e06d7b1bd823be8a8ca
Merge: 057566d fb7f503
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:55:50 2010 +0100

    Merge branch 'tests-canon-fixes'
    
    * tests-canon-fixes:
      Fix canon7.test failure.

commit fb7f5039ab30dace3e73aaac9e2af62926660da1
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:55:28 2010 +0100

    Fix canon7.test failure.
    
    * tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
    (lib.h, libd.c, libs.c): Use const for constant strings.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 057566d8f0da573e10910c8b5f740e7f8594bcf2
Merge: d7d84c9 c65a679
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:53:43 2010 +0100

    Merge branch 'tests-posixsubst-specialvars'
    
    * tests-posixsubst-specialvars:
      Fix typos in test comments.

commit c65a679d59426c17fba6e4d2e49f8dabef2b9f26
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Dec 16 19:52:48 2010 +0100

    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.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |   21 +++++++++++++++++++++
 Makefile.am                       |    2 +-
 Makefile.in                       |    2 +-
 tests/canon7.test                 |    8 ++++----
 tests/posixsubst-data.test        |    2 +-
 tests/posixsubst-extradist.test   |    2 +-
 tests/posixsubst-ldadd.test       |    2 +-
 tests/posixsubst-libraries.test   |    2 +-
 tests/posixsubst-ltlibraries.test |    2 +-
 tests/posixsubst-programs.test    |    2 +-
 tests/posixsubst-scripts.test     |    2 +-
 tests/posixsubst-sources.test     |    2 +-
 tests/posixsubst-tests.test       |    2 +-
 13 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e1b563..c238614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-12-16  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
 
        More uses of AS_HELP_STRING in automake macros.
diff --git a/Makefile.am b/Makefile.am
index 1dec51e..0bdcfbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,7 +342,7 @@ sc_tests_make_without_am_makeflags:
 
 ## Tests should never call make directly.
 sc_tests_plain_make:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*make'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; 
then \
          echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 
1>&2; \
          exit 1; \
        fi
diff --git a/Makefile.in b/Makefile.in
index 02f12b5..95489e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1089,7 +1089,7 @@ sc_tests_make_without_am_makeflags:
        fi
 
 sc_tests_plain_make:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*make'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; 
then \
          echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 
1>&2; \
          exit 1; \
        fi
diff --git a/tests/canon7.test b/tests/canon7.test
index 9b3d8d0..3f25d6f 100755
--- a/tests/canon7.test
+++ b/tests/canon7.test
@@ -43,7 +43,7 @@ dummy_dynamic_SOURCES = $(dummy_static_SOURCES)
 dummy_static_LDADD = $(noinst_LIBRARIES)
 dummy_dynamic_LDADD = $(noinst_LTLIBRARIES)
 
-_foo_bar_SOURCES = libs.c
+_foo_bar_SOURCES = libs.c foobar.c
 libb_az_baz_a_SOURCES = libs.c
 lib_zardoz___la_SOURCES = libd.c
 
@@ -76,9 +76,9 @@ int main(void)
 }
 END
 
-echo 'char *dummy_func(void);' > lib.h
-echo 'char *dummy_func(void) { return "Dynamic"; }' > libd.c
-echo 'char *dummy_func(void) { return "Static"; }' > libs.c
+echo 'const char *dummy_func(void);' > lib.h
+echo 'const char *dummy_func(void) { return "Dynamic"; }' > libd.c
+echo 'const char *dummy_func(void) { return "Static"; }' > libs.c
 
 libtoolize
 $ACLOCAL
diff --git a/tests/posixsubst-data.test b/tests/posixsubst-data.test
index 13d05b6..f1ffeae 100755
--- a/tests/posixsubst-data.test
+++ b/tests/posixsubst-data.test
@@ -37,7 +37,7 @@ bar.data bazzardoz:
 CLEANFILES = bar.data bazzardoz
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 dist_foo_DATA = $(t1:=.txt)
 foo_DATA = $(t2:x=.data)
 nodist_foo_DATA = $(t3:.y=zardoz)
diff --git a/tests/posixsubst-extradist.test b/tests/posixsubst-extradist.test
index 3509575..c3bf970 100755
--- a/tests/posixsubst-extradist.test
+++ b/tests/posixsubst-extradist.test
@@ -30,7 +30,7 @@ t1 = foo1 foo2
 t2 = bar.x
 t3 = baz-y
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 EXTRA_DIST = $(t1:=.c) $(t2:.x=.f) $(t3:-y=ar)
 bazar bar.f:
        : > $@
diff --git a/tests/posixsubst-ldadd.test b/tests/posixsubst-ldadd.test
index d4c5a7e..fa3a12c 100755
--- a/tests/posixsubst-ldadd.test
+++ b/tests/posixsubst-ldadd.test
@@ -38,7 +38,7 @@ zardoz_PROGRAMS = foo bar
 noinst_LIBRARIES = libquux1.a libquux2.a libquux3.a
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 LDADD = $(u:.lib=.a)
 bar_LDADD = $(v:=.a) libquux2.a $(w:none=libquux3.a)
 
diff --git a/tests/posixsubst-libraries.test b/tests/posixsubst-libraries.test
index 23e7e78..79b96bc 100755
--- a/tests/posixsubst-libraries.test
+++ b/tests/posixsubst-libraries.test
@@ -33,7 +33,7 @@ foolibs = libfoo1 libfoo2
 barlibs = libbaz
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 lib_LIBRARIES = $(foolibs:=.a) $(barlibs:z=r.a)
 
 libbar.c:
diff --git a/tests/posixsubst-ltlibraries.test 
b/tests/posixsubst-ltlibraries.test
index 7af1d93..c482db4 100755
--- a/tests/posixsubst-ltlibraries.test
+++ b/tests/posixsubst-ltlibraries.test
@@ -34,7 +34,7 @@ foolibs = libfoo1 libfoo2
 barlibs = libbaz
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 lib_LTLIBRARIES = $(foolibs:=.la) $(barlibs:z=r.la)
 
 libbar.c:
diff --git a/tests/posixsubst-programs.test b/tests/posixsubst-programs.test
index 73e5479..a8471f6 100755
--- a/tests/posixsubst-programs.test
+++ b/tests/posixsubst-programs.test
@@ -31,7 +31,7 @@ t1 = foo1 foo2
 t2 = barx bar2
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 bin_PROGRAMS = $(t1:=-p) $(t2:2=y)
 
 installcheck-local:
diff --git a/tests/posixsubst-scripts.test b/tests/posixsubst-scripts.test
index 94b51af..a6f253b 100755
--- a/tests/posixsubst-scripts.test
+++ b/tests/posixsubst-scripts.test
@@ -35,7 +35,7 @@ bar1 bar2 quux.pl:
 CLEANFILES = bar1 bar2 quux.pl
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 dist_sbin_SCRIPTS = $(t1:=.sh)
 libexec_SCRIPTS = $(t2:x=)
 nodist_bin_SCRIPTS = $(t3:-baz=x.pl)
diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test
index bde7b6a..97f4e55 100755
--- a/tests/posixsubst-sources.test
+++ b/tests/posixsubst-sources.test
@@ -34,7 +34,7 @@ BAR = bar__
 BAZ = baz.
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 foo_SOURCES = main.c $(FOO:.cxx=.c)
 dist_foo_SOURCES = $(BAR:__=.c)
 nodist_foo_SOURCES = $(BAZ:=c)
diff --git a/tests/posixsubst-tests.test b/tests/posixsubst-tests.test
index 158d0ad..98305ae 100755
--- a/tests/posixsubst-tests.test
+++ b/tests/posixsubst-tests.test
@@ -35,7 +35,7 @@ foo2.test barz:
 CLEANFILES = foo2.test barz # for FreeBSD make
 
 # Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignement operator.
+# into thinking that it's an unportable assignment operator.
 TESTS = $(t1:=.test) $(t2:x=y) $(t3:2=z)
 
 EXTRA_DIST = $(TESTS)


hooks/post-receive
-- 
GNU Automake