diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-04-12 13:32:58 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-12 14:08:57 +0200 |
| commit | c12161817a71b7ab5410896294ac44254e002d3b (patch) | |
| tree | 9cad10704cefef1f952186420fed72dd6d076bbc | |
| parent | d714ec513745fe50c03d49c9ab6481ce36d3a27e (diff) | |
| download | automake-c12161817a71b7ab5410896294ac44254e002d3b.tar.gz | |
vala: fix distcheck with c/vala mixed projects
Fixes automake bug#11229.
* automake.in (lang_vala_finish_target): Return early if the
current '_SOURCES' variable does not contain any '.vala' nor
'.vapi' source. Otherwise, the vala compiler will be called
without arguments, causing an error.
* tests/vala-mix.test: Enhance to catch the fixed bug.
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 | 3 | ||||
| -rwxr-xr-x | tests/vala-mix.test | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/automake.in b/automake.in index 08b33002a..836680af7 100644 --- a/automake.in +++ b/automake.in @@ -6041,6 +6041,9 @@ sub lang_vala_finish_target ($$) my @vala_sources = grep { /\.vala$/ } ($var->value_as_list_recursive); + # For automake bug#11229. + return unless @vala_sources; + foreach my $vala_file (@vala_sources) { (my $c_file = $vala_file) =~ s/(.*)\.vala$/$1.c/; diff --git a/tests/vala-mix.test b/tests/vala-mix.test index 012b36ad0..fe48f26a5 100755 --- a/tests/vala-mix.test +++ b/tests/vala-mix.test @@ -29,12 +29,13 @@ AC_OUTPUT END cat > Makefile.am <<'END' -bin_PROGRAMS = zardoz mu +bin_PROGRAMS = zardoz mu baz AM_VALAFLAGS = --profile=posix zardoz_SOURCES = foo.vala bar.c mu_SOURCES = 1.vala 2.c mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run mu_CFLAGS = -DHAVE_MU +baz_SOURCES = baz.c END if cross_compiling; then :; else @@ -74,6 +75,14 @@ chocke me #endif END +# For automake bug#11229. +cat > baz.c <<'END' +int main (void) +{ + return 0; +} +END + $ACLOCAL $AUTOMAKE -a $AUTOCONF |