From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 18 Sep 2011 15:36:05 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c31004a89fe50fedbce1b39cc567f06ab1c3a892;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  java: fix various blunders in test 'java-mix.test'
---

c31004a89fe50fedbce1b39cc567f06ab1c3a892
diff --cc ChangeLog
index 50dfb61d9,468c205b6..b0317a695
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,51 +1,12 @@@
+ 2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	java: fix various blunders in test 'java-mix.test'
+ 	* tests/java-mix.test: Add missing call to `set -e'.  Fix inverted
+ 	semantics (`.java' files are expected *not* to be distributed by
+ 	default, not the other way round).  Fix various typos in the name
+ 	of the `.java' files.  Correct other minor blunders.  Improve some
+ 	comments.
+ 
 -2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 -
 -	java: allow both JAVA and nobase_JAVA in the same Makefile.am
 -	* automake.in (handle_java): Also strip `nobase_' from the given
 -	prefix, when needed.
 -	* tests/java-clean.test: Update and extend.
 -	* tests/java-compile-install.test: Likewise.
 -	* tests/java-no-duplicate.test: Likewise.
 -	* tests/java-sources.test: Likewise.
 -	* tests/java-noinst.test: Likewise.
 -	* tests/java-mix-dist-nodist.test: Renamed to ...
 -	* tests/java-mix.test: ... this, and extended.
 -	* tests/java-nobase.test: New test, still xfailing due to
 -	unrelated issues.
 -	* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
 -
 -2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 -
 -	java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
 -	Fixes automake bug#8434.
 -	* automake.in (handle_java): Strip `dist_' and `nodist_' from
 -	the given prefix.  Define a new internal Makefile variable
 -	`am__java_sources'.  Related adjustments.
 -	* lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
 -	first time this am file is processed.
 -	(class%DIR%.stamp): Stamp file renamed ...
 -	(class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
 -	prefixes are stripped from the name of the stampfile.  Adjust
 -	declaration of dependencies by using the new automake-generated
 -	internal variable `$(am__java_sources)'.  In the rule, use `$@'
 -	as the name of the target, rather than hard-coding it.
 -	* tests/java.test: Update and extend.
 -	* tests/java-no-duplicate.test: New test.
 -	* tests/java-mix-dist-nodist.test: Likewise.
 -	* tests/java-compile-and-install.test: Likewise.
 -	* tests/java-clean.test: Likewise.
 -	* tests/java-sources.test: Likewise.
 -	* tests/Makefile.am (TESTS): Update.
 -
  2011-09-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix spurious failure on fast machines