From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 12 Apr 2012 18:08:56 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f94310a380705f493142c8f130fc616c039e19fe;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  news: remove older entry for "future backward incompatibilities"
  news: document fixes for bug#11222 and bug#11229
  vala: fix distcheck with c/vala mixed projects
  news: fix typo
  vala: fix vapi files handling
  vala: test vapi files handling (still failing)
---

f94310a380705f493142c8f130fc616c039e19fe
diff --cc automake.in
index cadb0839e,7930ff1ed..820285b48
--- a/automake.in
+++ b/automake.in
@@@ -5742,8 -5829,9 +5745,9 @@@ sub lang_vala_finish_target ($$
        $output_rules .= "\$(srcdir)/$c_file: \$(srcdir)/${derived}_vala.stamp\n"
          . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n"
          . "\t\@if test -f \$@; then :; else \\\n"
 -        . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n"
 +        . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
          . "\tfi\n"
+         if $c_file =~ s/(.*)\.vala$/$1.c/;
      }
  
    # Add rebuild rules for generated header and vapi files