From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 9 Apr 2011 21:27:48 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~384
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=475fe6935b26ff42cfe7b88bd87cf0563a7c866e;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'
---

475fe6935b26ff42cfe7b88bd87cf0563a7c866e
diff --cc ChangeLog
index 029fdcc,d82d363..96969a8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,16 +1,47 @@@
  2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	java: check_JAVA does not cause compilation by "make all" anymore
+ 	Fixes automake bug#8234.
+ 	* automake.in (handle_java): Make stamp of class files built from
+ 	java sources in $(check_JAVA) a dependency of `check' target, not
+ 	`all' target.
+ 	* tests/java-check.test: New test.
+ 	* tests/Makefile.am (TESTS): Update.
+ 	* NEWS: Update.
+ 	* THANKS: Update.
+ 	Report from Petteri Räty.
+ 
++2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +	    Bruno Haible  <bruno@clisp.org>
 +
 +	coverage: add tests on remake rules in more complex situations
 +	* tests/defs (using_gmake): New function.
 +	(for tool in $required): Use it when $tool is 'GNUmake'.
 +	* tests/remake-moved-m4-file.test: New test.
 +	* tests/remake-deleted-m4-file.test: Likewise.
 +	* tests/remake-renamed-m4-file.test: Likewise.
 +	* tests/remake-renamed-m4-macro-and-file.test: Likewise.
 +	* tests/remake-renamed-m4-macro.test: Likewise.
 +	* tests/remake-add-acsubst-gnulib.test: Likewise.
 +	* tests/remake-add-header-gnulib.test: Likewise.
 +	* tests/remake-remove-header-gnulib.test: Likewise.
 +	* tests/Makefile.am (TESTS): Update.
 +
 +2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	typofix in 'tests/defs'
 +	* tests/defs: Fix typo (`itslef' instead of `itself') in
 +	comments.
 +
 +2011-04-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	coverage: more on java support EXTRA_ and noinst_ prefixes
 +	* tests/java-extra.test: New test, checking support for the
 +	prefix `EXTRA_' with the JAVA primary.
 +	* tests/java-noinst.test: New test, checking support for the
 +	prefix `noinst_' with the JAVA primary.
 +	* tests/Makefile.am (TESTS): Update.
 +
  2011-04-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
  	Clarify regex code in depcomp.
diff --cc automake.in
index f9a6821,a8ec749..a1c6f30
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in
diff --cc tests/Makefile.am
index 2eaef32,bf07f2b..5b02a66
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -521,10 -421,9 +521,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
+ java-check.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \
diff --cc tests/Makefile.in
index 8aa7886,d8bf050..fd573d5
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -782,10 -691,9 +782,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
+ java-check.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \