diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-31 12:41:13 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-31 12:41:13 +0100 |
| commit | 153f861b91221d14842c495efa0b1f10d9455855 (patch) | |
| tree | a73c27f5ffc6738074613051c8bfaf371b1a5833 /Makefile.am | |
| parent | 0faf1588b9e820c20351c92afa44c9d0e8a3a412 (diff) | |
| parent | 0494881b53d6a125c1e4feeb03101de351085a1b (diff) | |
| download | automake-153f861b91221d14842c495efa0b1f10d9455855.tar.gz | |
Merge branch 'maint'
* maint:
vala tests: source test-init.sh, not ./defs
tests: fix a spurious typo-related failure
tests: remove spurious leftover use of 'Exit'
tests: can check our recipes avoid trailing backslashes
vala: improve comments to AM_PROG_VALAC
news: update w.r.t. recent vala changes
vala: if no proper compiler found, set $(VALAC) to 'valac'
vala: AM_PROG_VALAC should not produce an error for tool-old valac
docs: document recent changes to AM_PROG_VALAC
tests: enhance tests on AM_PROG_VALAC
vala: style fixes in vala.m4
vala: add action arguments, for when no proper vala compiler is found
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ddf71b38c..065500f90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -423,6 +423,19 @@ EXTRA_DIST += t/ax/test-defs.in CLEANFILES += t/ax/test-defs.sh nodist_noinst_DATA = t/ax/test-defs.sh +noinst_SCRIPTS = # Will be updated soon. + +t/ax/shell-no-trail-bslash: t/ax/shell-no-trail-bslash.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)in=t/ax/shell-no-trail-bslash.in \ + && $(MKDIR_P) t/ax \ + && $(do_subst) <$(srcdir)/$$in >$@-t \ + && chmod a+x $@-t + $(generated_file_finalize) +EXTRA_DIST += t/ax/shell-no-trail-bslash.in +CLEANFILES += t/ax/shell-no-trail-bslash +noinst_SCRIPTS += t/ax/shell-no-trail-bslash + runtest: runtest.in Makefile $(AM_V_at)rm -f $@ $@-t $(AM_V_GEN)in=runtest.in \ @@ -432,7 +445,7 @@ runtest: runtest.in Makefile $(generated_file_finalize) EXTRA_DIST += runtest.in CLEANFILES += runtest -noinst_SCRIPTS = runtest +noinst_SCRIPTS += runtest # If two test scripts have the same basename, they will end up sharing # the same log file, leading to all sort of undefined and undesired @@ -484,6 +497,17 @@ check-tests-syntax: check-local: check-tests-syntax .PHONY: check-tests-syntax +# Recipes with a trailing backslash character (possibly followed by +# blank characters only) can cause spurious syntax errors with at +# least older bash versions (e.g., bash 2.05b), and can be potentially +# be unportable to other weaker shells. Run the testsuite in a way +# that helps catching such problems in Automake-generated recipes. +# See automake bug#10436. +check-no-trailing-backslash-in-recipes: + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \ + CONFIG_SHELL='$(abs_top_builddir)/t/ax/shell-no-trail-bslash' +.PHONY: check-no-trailing-backslash-in-recipes + ## Checking the list of tests. test_subdirs = t t/pm contrib/t include $(srcdir)/t/CheckListOfTests.am |