From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 6 Sep 2011 21:54:49 +0000 (+0200)
Subject: Merge branch 'maint' into java-work
X-Git-Tag: ng-0.5a~123^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829c04e73e888e8d03371f20707a8e993c217d15;p=thirdparty%2Fautomake.git

Merge branch 'maint' into java-work

* maint:
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS
  tests: simplify wrapper for aclocal
  fix: minor typo in ChangeLog
  coverage: vala support failing for VPATH from-scratch builds
  docs: report few more automake parsing limitations
---

829c04e73e888e8d03371f20707a8e993c217d15
diff --cc tests/Makefile.am
index a93f4f86f,38f2319cf..41b19f7aa
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -21,9 -21,9 +21,10 @@@ all.test 
  auxdir2.test \
  cond17.test \
  gcj6.test \
 +java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
+ vala-vpath.test \
  txinfo5.test
  
  include $(srcdir)/parallel-tests.am
diff --cc tests/Makefile.in
index 3f603c7a0,ffb2fe21d..2cec3a06b
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -286,9 -286,9 +286,10 @@@ all.test 
  auxdir2.test \
  cond17.test \
  gcj6.test \
 +java-nobase.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
+ vala-vpath.test \
  txinfo5.test
  
  parallel_tests = \