[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2-88-g3950866

[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=395086602f44cf6804f3c7c7f990c18a274bca5b

The branch, branch-1.11 has been updated
       via  395086602f44cf6804f3c7c7f990c18a274bca5b (commit)
       via  3e1395b2d2f145b2dbfd8ebfc1b53d5699719bb1 (commit)
       via  e064ff7997a1425942fe32c0c0488f922fe1ea9a (commit)
       via  6bb56e40bd31baa2488f0975e9d03e69ba7e963e (commit)
       via  d850165e6c9722adf2b80442974f3ca014c35298 (commit)
       via  72f7e5de24468adfeded4b14eae97a839ae3b531 (commit)
       via  c7ee8c6db00ddc4cd90b9d44c5ccf3a90d26663b (commit)
      from  d5813f39b98841b990135b3cc4121249da698249 (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 395086602f44cf6804f3c7c7f990c18a274bca5b
Merge: 3e1395b e064ff7
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 12 10:02:32 2012 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: make 'aclocal-install-absdir.test' executable
      tests: require GNU make in 'vala-vapth.test'
      vala: fix VPATH builds
      tests: fix some bugs in the vala-vpath test

commit 3e1395b2d2f145b2dbfd8ebfc1b53d5699719bb1
Merge: d5813f3 6bb56e4
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 12 10:01:45 2012 +0100

    Merge branch 'msvc' into branch-1.11
    
    * msvc:
      tests: add missing dependency for some 'ar-lib*.test' tests

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

Summary of changes:
 NEWS                              |    2 ++
 THANKS                            |    1 +
 automake.in                       |    8 ++++----
 tests/Makefile.am                 |    4 +++-
 tests/vala-vpath.test             |   28 +++++++++++++++++++++-------
 tests/vala2.test                  |   11 +++++++++--
 6 files changed, 40 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 tests/aclocal-install-absdir.test

diff --git a/NEWS b/NEWS
index 1eabfa9..dfba28f 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,8 @@ Bugs fixed in 1.11.2a:
     configure time, and cannot be overridden at make time with
     `make V=0' or `make V=1'.
 
+  - Vala support now works better in VPATH setups.
+
 
 New in 1.11.2:
 
diff --git a/THANKS b/THANKS
index e9c6db8..fbb7eb4 100644
--- a/THANKS
+++ b/THANKS
@@ -315,6 +315,7 @@ Roman Fietze                address@hidden
 Ronald Landheer                address@hidden
 Roumen Petrov          address@hidden
 Rusty Ballinger                address@hidden
+Ryan Lortie            address@hidden
 Ryan T. Sammartino     address@hidden
 Sam Hocevar            address@hidden
 Sam Sirlin             address@hidden
diff --git a/automake.in b/automake.in
index 5c16afd..6e3754e 100644
--- a/automake.in
+++ b/automake.in
@@ -6045,7 +6045,7 @@ sub lang_vala_finish_target ($$)
           $output_rules .= "\$(srcdir)/$file: 
\$(srcdir)/${derived}_vala.stamp\n"
             . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
             . "address@hidden test -f \$@; then :; else \\\n"
-            . "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) 
${derived}_vala.stamp; \\\n"
+            . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; 
\\\n"
            . "\tfi\n"
             if $file =~ s/(.*)\.vala$/$1.c/;
         }
@@ -6065,7 +6065,7 @@ sub lang_vala_finish_target ($$)
              $output_rules .= "\$(srcdir)/$headerfile: 
\$(srcdir)/${derived}_vala.stamp\n"
                . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
                . "address@hidden test -f \$@; then :; else \\\n"
-               . "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) 
${derived}_vala.stamp; \\\n"
+               . "\t  \$(MAKE) \$(AM_MAKEFLAGS) 
\$(srcdir)/${derived}_vala.stamp; \\\n"
                . "\tfi\n";
 
              # valac is not used when building from dist tarballs
@@ -6098,8 +6098,8 @@ sub lang_vala_finish_target ($$)
   my $silent = silent_flag ();
 
   $output_rules .=
-    "${derived}_vala.stamp: \$(${derived}_SOURCES)\n".
-    "\t${verbose}${compile} \$(${derived}_SOURCES)\n".
+    "\$(srcdir)/${derived}_vala.stamp: \$(${derived}_SOURCES)\n".
+    "\t${verbose}cd \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
     "\t${silent}touch address@hidden";
 
   push_dist_common ("${derived}_vala.stamp");
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e97ee60..ed6e154 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,6 @@ pr8365-remake-timing.test \
 lex-subobj-nodep.test \
 remake-am-pr10111.test \
 remake-m4-pr10111.test \
-vala-vpath.test \
 txinfo5.test
 
 include $(srcdir)/parallel-tests.am
@@ -963,6 +962,9 @@ $(parallel_tests)
 
 # FIXME: make these automatically computed once we are merged into
 # FIXME: the `testsuite-work' branch.
+ar-lib4.log: libtool-macros.log
+ar-lib6a.log: libtool-macros.log
+ar-lib6b.log: libtool-macros.log
 depcomp4.log: libtool-macros.log
 depcomp7.log: libtool-macros.log
 depcomp8b.log: libtool-macros.log
diff --git a/tests/aclocal-install-absdir.test 
b/tests/aclocal-install-absdir.test
old mode 100644
new mode 100755
diff --git a/tests/vala-vpath.test b/tests/vala-vpath.test
index 98e0f43..8f2b677 100755
--- a/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,13 +17,11 @@
 # Test to make sure vala support handles from-scratch VPATH builds.
 # See automake bug#8753.
 
-required="valac"
+required="valac GNUmake"
 . ./defs || Exit 1
 
 set -e
 
-mkdir src
-
 cat >> configure.in << 'END'
 AC_CONFIG_SRCDIR([hello.vala])
 AC_PROG_CC
@@ -31,17 +29,16 @@ AM_PROG_VALAC([0.7])
 AC_OUTPUT
 END
 
-
 cat > Makefile.am <<'END'
 bin_PROGRAMS = foo
+foo_VALAFLAGS = --profile=posix
 foo_SOURCES = hello.vala
 END
 
 cat > hello.vala <<'END'
 void main ()
 {
-  stdout.printf ("foo\n");
-  return 0;
+  stdout.printf ("foofoofoo\n");
 }
 END
 
@@ -53,6 +50,23 @@ mkdir build
 cd build
 ../configure || Exit 77
 $MAKE
+grep foofoofoo ../hello.c
 $MAKE distcheck
 
+# Rebuild rules work also in VPATH builds.
+cat > ../hello.vala <<'END'
+int main ()
+{
+  stdout.printf ("barbarbar\n");
+  return 0;
+}
+END
+
+$MAKE
+grep barbarbar ../hello.c
+
+# Rebuild rules are not uselessly triggered.
+$MAKE -q
+$MAKE -n | grep '\.stamp' && Exit 1
+
 :
diff --git a/tests/vala2.test b/tests/vala2.test
index e559540..a8a3d90 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -81,7 +81,14 @@ cd build
 $MAKE
 $MAKE distcheck
 
-# test rebuild rules from builddir
-touch ../src/zardoz.vala
+# Test rebuild rules from builddir.
+rm -f ../src/zardoz.c
 $MAKE
+grep 'Zardoz!' ../src/zardoz.c
+sed 's/Zardoz!/FooBar!/' ../src/zardoz.c > t
+mv -f t ../src/zardoz.c
+$MAKE
+grep 'FooBar!' ../src/zardoz.c
+grep 'Zardoz!' ../src/zardoz.c && Exit 1
 
+:


hooks/post-receive
-- 
GNU Automake