From 9ad7002db01b035481f5909f702e9d1a095b4a75 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 12 Apr 2012 11:06:01 +0200 Subject: [PATCH] vala: fix distcheck with c/vala mixed projects Signed-off-by: Marc-Antoine Perennou --- automake.in | 5 +++++ tests/vala-mix.test | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/automake.in b/automake.in index 291b364..48527e5 100644 --- a/automake.in +++ b/automake.in @@ -5820,6 +5820,11 @@ sub lang_vala_finish_target ($$) my @vala_sources = grep { /\.(vala|vapi)$/ } ($var->value_as_list_recursive); + if (! @vala_sources) + { + return; + } + foreach my $vala_file (@vala_sources) { my $c_file = $vala_file; diff --git a/tests/vala-mix.test b/tests/vala-mix.test index 58ab500..c918855 100755 --- a/tests/vala-mix.test +++ b/tests/vala-mix.test @@ -27,12 +27,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 @@ -72,6 +73,13 @@ chocke me #endif END +cat > baz.c <<'END' +int main () +{ + return 0; +} +END + $ACLOCAL $AUTOMAKE -a $AUTOCONF -- 1.7.9.1.244.gb0d66b.dirty