[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2-132-g7db933d

[Stefano Lattarini]

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=7db933d75df18dd265c22e2cb8bf4301eb99dfd7

The branch, branch-1.11 has been updated
       via  7db933d75df18dd265c22e2cb8bf4301eb99dfd7 (commit)
       via  3a422887c20556cc9f5e4a856c046f336f2997b4 (commit)
       via  b08103fedac9fbdf0a24f9192a901ea4b01e45af (commit)
       via  d266b5f7fb2fbb7fddb5b8515d57c32b45a50c67 (commit)
       via  8ddff1004c14bf94d9bcaf1c3b2a29da58e7adf7 (commit)
      from  7f3a7271101d0add799abd44f0326b8aa73a0c1d (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 7db933d75df18dd265c22e2cb8bf4301eb99dfd7
Merge: 7f3a727 3a42288
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jan 23 10:13:18 2012 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: fix spurious failure due to autom4te caching
      vala: fix name of temporary file used in vala rules
      vala tests: add missing 'valac' requirement, and other minor fixlets
      news: fix grammaro

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

Summary of changes:
 NEWS                |    2 +-
 automake.in         |    4 ++--
 tests/lzma.test     |    3 ++-
 tests/vala-mix.test |    5 +++--
 tests/vala.test     |    5 +++++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index ebc0714..06d4213 100644
--- a/NEWS
+++ b/NEWS
@@ -40,7 +40,7 @@ New in 1.11.2a:
   - The master copy of the `gnupload' script is now maintained in gnulib,
     not in automake.
 
-  - The `missing' script don't try to wrap calls to `tar' anymore.
+  - The `missing' script doesn't try to wrap calls to `tar' anymore.
 
   - "make dist" doesn't wrap `tar' invocations with the `missing' script
     anymore.  Similarly, the obsolescent variable `$(AMTAR)' (which you
diff --git a/automake.in b/automake.in
index cd918b9..a18d5a5 100644
--- a/automake.in
+++ b/automake.in
@@ -6105,9 +6105,9 @@ sub lang_vala_finish_target ($$)
 # especially important on systems with sub-second timestamp resolution).
 # Thus we need to create the stamp file *before* invoking valac, and to
 # move it to its final location only after valac has been invoked.
-    "\t${silent}rm -f \$@ && echo stamp > address@hidden".
+    "\t${silent}rm -f \$\@ && echo stamp > address@hidden".
     "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
-    "\t${silent}mv -f address@hidden address@hidden";
+    "\t${silent}mv -f address@hidden address@hidden";
 
   push_dist_common ("${derived}_vala.stamp");
 
diff --git a/tests/lzma.test b/tests/lzma.test
index 7ee59f7..bf65aea 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -40,7 +40,8 @@ test: distcheck
        test -f $(DIST_ARCHIVES)
 END
 
-$ACLOCAL --force
+rm -rf autom4te*.cache
+$ACLOCAL
 AUTOMAKE_fails
 grep "^configure\\.in:2:.*$errmsg" stderr
 
diff --git a/tests/vala-mix.test b/tests/vala-mix.test
index f597a7f..73a07d9 100755
--- a/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@ -16,7 +16,7 @@
 
 # Vala sources and C sources in the same program.  Functional test.
 
-required='cc GNUmake'
+required='valac cc GNUmake'
 . ./defs || Exit 1
 
 set -e
@@ -96,8 +96,9 @@ have_generated_files ()
 # C files.
 have_generated_files
 
+# Remake rules are not uselessly triggered.
 $MAKE -q
-$MAKE -n | grep stamp && Exit 1
+$MAKE -n | $FGREP vala.stamp && Exit 1
 
 # Check the distribution.
 $MAKE distcheck
diff --git a/tests/vala.test b/tests/vala.test
index 9750942..fc17987 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -85,4 +85,9 @@ $FGREP 'baz.c' sub/Makefile.in
 $FGREP 'foo_vala.stamp:' sub/Makefile.in
 test `$FGREP -c '.stamp:' sub/Makefile.in` -eq 1
 
+# Check against regression for weird bug due to unescaped '@'
+# characters used in a "..." perl string when writing the vala
+# rules from automake.in.
+grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
+
 :


hooks/post-receive
-- 
GNU Automake