[PATCH] VPATH builds with Vala

[Bahjat Salem]

From f9ec1a8d477cb575cddb1a2f56070a736cfc32c1 Mon Sep 17 00:00:00 2001
From: Bahjat SALEM <bahjat.sa...@telecom-bretagne.eu>
Date: Sat, 24 Oct 2009 23:43:16 +0200
Subject: [PATCH] Automake now supports VPATH builds with Vala.

I've put the .stamp file in the build tree to fix the problem.
---
 automake.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/automake.in b/automake.in
index 2af2897..5d546ab 100755
--- a/automake.in
+++ b/automake.in
@@ -5979,9 +5979,9 @@ sub lang_vala_finish_target ($$)
     {
       foreach my $file ($var->value_as_list_recursive)
         {
-          $output_rules .= "\$(srcdir)/$file: 
\$(srcdir)/${derived}_vala.stamp\n".
+          $output_rules .= "\$(srcdir)/$file: ${derived}_vala.stamp\n".
             "\...@if test -f \$@; then :; else \\\n".
-            "\t  rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
+            "\t  rm -f ${derived}_vala.stamp; \\\n".
             "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) 
${derived}_vala.stamp; \\\n".
             "\tfi\n"
             if $file =~ s/(.*)\.vala$/$1.c/;
@@ -5999,9 +5999,9 @@ sub lang_vala_finish_target ($$)
                                  '--vapi', '--internal-vapi', '--gir')))
            {
              my $headerfile = $flag;
-             $output_rules .= "\$(srcdir)/$headerfile: 
\$(srcdir)/${derived}_vala.stamp\n".
+             $output_rules .= "\$(srcdir)/$headerfile: 
${derived}_vala.stamp\n".
                "\...@if test -f \$@; then :; else \\\n".
-               "\t  rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
+               "\t  rm -f ${derived}_vala.stamp; \\\n".
                "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) 
${derived}_vala.stamp; \\\n".
                "\tfi\n";
 
@@ -6035,8 +6035,8 @@ sub lang_vala_finish_target ($$)
   my $silent = silent_flag ();
 
   $output_rules .=
-    "${derived}_vala.stamp: \$(${derived}_SOURCES)\n".
-    "\t${verbose}${compile} \$(${derived}_SOURCES)\n".
+    "${derived}_vala.stamp: \$(srcdir)/\$(${derived}_SOURCES)\n".
+    "\t${verbose}${compile} \$(srcdir)/\$(${derived}_SOURCES)\n".
     "\t${silent}touch \...@\n";
 
   push_dist_common ("${derived}_vala.stamp");
-- 
1.6.0.4

signature.asc
Description: This is a digitally signed message part.