>From 7b3199fb4bdcff7304223e0a20808ed7d5681f31 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Marc-Antoine Perennou Date: Wed, 11 Apr 2012 11:18:31 +0200 Subject: [PATCH 2/2] vala: fix vapi files handling Fixes automake bug#11222. Issue introduced in commit 'v1.11-696-g51f61df' of 27-02-2012, "vala: fix 'valac' calls for projects with mixed Vala/C", which fixed automake bug#10894. * automake.in (lang_vala_finish_target): Also recognize '.vapi' as an extension for vala input files. * tests/list-of-tests.mk (XFAIL_TESTS): Remove 'vala-vapi.test'. Copyright-paperwork-exempt: yes Signed-off-by: Marc-Antoine Perennou Signed-off-by: Stefano Lattarini --- automake.in | 5 +++-- tests/list-of-tests.mk | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automake.in b/automake.in index 08b3300..765a769 100644 --- a/automake.in +++ b/automake.in @@ -6039,16 +6039,17 @@ sub lang_vala_finish_target ($$) my $var = var "${derived}_SOURCES"; return unless $var; - my @vala_sources = grep { /\.vala$/ } ($var->value_as_list_recursive); + my @vala_sources = grep { /\.(vala|vapi)$/ } ($var->value_as_list_recursive); foreach my $vala_file (@vala_sources) { - (my $c_file = $vala_file) =~ s/(.*)\.vala$/$1.c/; + my $c_file = $vala_file; $output_rules .= "\$(srcdir)/$c_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 \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n" . "\tfi\n" + if $c_file =~ s/(.*)\.vala$/$1.c/; } # Add rebuild rules for generated header and vapi files diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk index 8367312..c344171 100644 --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@ -32,7 +32,6 @@ pr8365-remake-timing.test \ lex-subobj-nodep.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ -vala-vapi.test \ txinfo5.test perl_TESTS = \ -- 1.7.9.5