From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 25 Aug 2011 19:22:19 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a1c8a908af2ac955405d622abf6d8711ffb522;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: list "forgotten" test script in TESTS
---

93a1c8a908af2ac955405d622abf6d8711ffb522
diff --cc tests/Makefile.am
index 850240974,a1c67ffc3..a194f4457
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -544,10 -444,9 +544,11 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \
diff --cc tests/Makefile.in
index 5b5714123,4b2d8457d..7fe2c9386
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -817,10 -722,9 +817,11 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \