diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-12 18:04:19 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-12 18:04:19 +0200 |
| commit | 326ff45b8da46ab409b4a69d4861ad3211f0e132 (patch) | |
| tree | a5e1df4935a12c23f7dacb535da40567aaa56f0d /t/vala-mix.sh | |
| parent | 6e249ed689839eaf9b3ef85b5082f7d8b6815872 (diff) | |
| parent | 54ac5d47f719b4db1fe96e28e4b7218e70a877cc (diff) | |
| download | automake-326ff45b8da46ab409b4a69d4861ad3211f0e132.tar.gz | |
Merge branch 'maint'
* maint:
vala: fix distcheck with c/vala mixed projects
vala: fix vapi files handling
vala: test vapi files handling (still failing)
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/vala-mix.sh')
| -rwxr-xr-x | t/vala-mix.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/t/vala-mix.sh b/t/vala-mix.sh index 58ab50028..7e04b60c2 100755 --- a/t/vala-mix.sh +++ b/t/vala-mix.sh @@ -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,14 @@ chocke me #endif END +# For automake bug#11229. +cat > baz.c <<'END' +int main (void) +{ + return 0; +} +END + $ACLOCAL $AUTOMAKE -a $AUTOCONF |