[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-631-gd850165

[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=d850165e6c9722adf2b80442974f3ca014c35298

The branch, maint has been updated
       via  d850165e6c9722adf2b80442974f3ca014c35298 (commit)
       via  72f7e5de24468adfeded4b14eae97a839ae3b531 (commit)
       via  c7ee8c6db00ddc4cd90b9d44c5ccf3a90d26663b (commit)
      from  01c3294bac3b67004d208449fe9460fc3ab61ee4 (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 d850165e6c9722adf2b80442974f3ca014c35298
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 8 12:49:57 2012 +0100

    tests: require GNU make in 'vala-vapth.test'
    
    * vala-vpath.test ($required): Add the "GNUmake" requirement, since
    rules generated by vala support are expected to work with GNU make
    only.

commit 72f7e5de24468adfeded4b14eae97a839ae3b531
Author: Ryan Lortie <address@hidden>
Date:   Sat Jan 7 01:08:11 2012 -0500

    vala: fix VPATH builds
    
    This change fixes automake bug#9859.
    
    * automake.in (lang_vala_finish_target): Create the stamp file
    '${derived}_vala.stamp' in $(srcdir), not in $(builddir).
    Also, don't try to chdir to the $(srcdir) to trigger the rebuild
    rules, since that is just wrong in a VPATH setup.
    * tests/vala-vpath.test, tests/vala2.test: Extend to catch more
    possible VPATH issues.
    * tests/Makefile.am (XFAIL_TESTS): Remove 'vala-vpath.test'.
    * NEWS, THANKS: Update.
    
    Co-authored-by: Stefano Lattarini <address@hidden>
    Copyright-paperwork-exempt: yes

commit c7ee8c6db00ddc4cd90b9d44c5ccf3a90d26663b
Author: Ryan Lortie <address@hidden>
Date:   Sat Jan 7 01:06:37 2012 -0500

    tests: fix some bugs in the vala-vpath test
    
    * tests/vala-vpath.test: There are (trivial) problems in this
    testcase that would cause the build to fail even if the core
    issue were resolved.  Fix those.
    
    Copyright-paperwork-exempt: yes

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

Summary of changes:
 NEWS                  |    2 ++
 THANKS                |    1 +
 automake.in           |    8 ++++----
 tests/Makefile.am     |    1 -
 tests/vala-vpath.test |   28 +++++++++++++++++++++-------
 tests/vala2.test      |   11 +++++++++--
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 2b09bb5..9f2c6a1 100644
--- a/NEWS
+++ b/NEWS
@@ -129,6 +129,8 @@ Bugs fixed in 1.11.0a:
 
 * Long-standing bugs:
 
+  - Vala support now works better in VPATH setups.
+
   - The "deleted header file problem" for *.am files is avoided by stub
     rules.  This allows `make' to trigger a rerun of `automake' also if
     some previously needed `.am' file has been removed.
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 a689b63..e1d6319 100644
--- a/automake.in
+++ b/automake.in
@@ -6023,7 +6023,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/;
         }
@@ -6043,7 +6043,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
@@ -6076,8 +6076,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 9db0a03..8817b64 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
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