diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-04-11 11:18:31 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-12 01:23:44 +0200 |
| commit | 7b3199fb4bdcff7304223e0a20808ed7d5681f31 (patch) | |
| tree | ba1e589ddff596a724980b211ee59afa8328fbbe | |
| parent | 072071c7d1c20fc1c85ee1e09796a08f6504d1d0 (diff) | |
| download | automake-7b3199fb4bdcff7304223e0a20808ed7d5681f31.tar.gz | |
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 <Marc-Antoine@Perennou.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | automake.in | 5 | ||||
| -rw-r--r-- | tests/list-of-tests.mk | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/automake.in b/automake.in index 08b33002a..765a76998 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" . "\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" . "\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 83673129c..c34417180 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 = \ |