From: Stefano Lattarini Date: Mon, 19 Sep 2011 16:24:44 +0000 (+0200) Subject: Merge branch 'fix-java-prefix-is-unexpected' into maint X-Git-Tag: v1.11.1b~17^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6;p=thirdparty%2Fautomake.git Merge branch 'fix-java-prefix-is-unexpected' into maint --- 9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6 diff --cc ChangeLog index aec00f437,6c66f9e0a..72b7dad0a --- a/ChangeLog +++ b/ChangeLog @@@ -1,26 -1,14 +1,37 @@@ + 2011-09-19 Stefano Lattarini + + tests: fix spurious failure in 'primary-prefix-valid-couples.test' + * tests/primary-prefix-valid-couples.test: After commit + v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary + combination by default anymore: one has to explicitly define + $(javadir) to make it so. So just drop `java_JAVA' from our + Makefile.am Also, since we are at it, ... + (configure.in): ... remove AM_PROG_GCJ from here, as it's not + really required. + +2011-09-19 Stefano Lattarini + + docs: deprecate JAVA primary + * doc/automake.texi (Java): Deprecate the JAVA primary, stating + that it will become obsolete in automake 1.12 and probably removed + altogether in automake 1.13. Reflect this in the section title, + by appending the string "(deprecated feature)". + (@menu, @detailmenu): Update. + (Java Support with gcj): The cross-referenced support for bytecode + compilation with the JAVA primary is rudimentary and deprecated. + State that explicitly. + +2011-09-19 Stefano Lattarini + + docs: clearer distinction between `.java' with javac and with gcj + * doc/automake.texi (Java support): Rename this node ... + (Java support with gcj): ... to this, and change its title from + "Compiling Java sources" to "Compiling Java sources using gcj". + (@detailmenu, @menu, @cindex): Update and make more precise. + (Java): Change the title of this node from simply "Java" to + "Java bytecode compilation". + (@detailmenu, @menu, @cindex): Update and make more precise. + 2011-09-18 Stefano Lattarini java: complain if java_JAVA is used but $(javadir) is undefined