Hi Benoit, thanks for the patch.
On Saturday 16 July 2011, Benoit Sigoure wrote:
> * doc/automake.texi (Java Support, Java): Add cross-references.
> ---
> ChangeLog | 5 +++++
> doc/automake.texi | 8 +++++---
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 42687cf..43bc350 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,8 @@
> +2011-07-15 Benoit Sigoure <tsuna...@gmail.com>
> +
> + docs: Add references between the 2 sections on compiling Java.
> + * doc/automake.texi (Java Support, Java): Add cross-references.
> +
> 2011-07-08 Stefano Lattarini <stefano.lattar...@gmail.com>
>
> tests: fix weakness in 'tests-environment-backcompat.test'
> diff --git a/doc/automake.texi b/doc/automake.texi
> index 1f16dd3..05967f0 100644
> --- a/doc/automake.texi
> +++ b/doc/automake.texi
> @@ -6693,8 +6693,9 @@ is as follows:
> @cindex Java support
> @cindex Support for Java
>
> -Automake includes support for compiled Java, using @command{gcj}, the Java
> -front end to the GNU Compiler Collection.
> +Automake includes support for natively compiled Java, using @command{gcj},
> +the Java front end to the GNU Compiler Collection, as well as some
> preliminary
> +support for compiling Java to bytecode (see @pxref{Java}).
>
> Any package including Java code to be compiled must define the output
> variable @code{GCJ} in @file{configure.ac}; the variable @code{GCJFLAGS}
> @@ -7563,7 +7564,8 @@ libtool, The Libtool Manual}) with the
> @code{LTLIBRARIES} primary.
> @cindex Primary variable, @code{JAVA}
>
> Automake provides some minimal support for Java compilation with the
> -@code{JAVA} primary.
> +@code{JAVA} primary, as well as support for compiling Java to native
> +machine code (see @pxref{Java Support}).
>
> Any @file{.java} files listed in a @code{_JAVA} variable will be
> compiled with @code{JAVAC} at build time. By default, @file{.java}
>
I've amended the patch a bit, squashing in the following:
-*-*-*-
diff --git a/ChangeLog b/ChangeLog
index 49312eb..5e45059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2011-07-15 Benoit Sigoure <tsuna...@gmail.com>
- docs: Add references between the 2 sections on compiling Java.
+ docs: add references between the 2 sections on java support
* doc/automake.texi (Java Support, Java): Add cross-references.
2011-07-08 Stefano Lattarini <stefano.lattar...@gmail.com>
diff --git a/doc/automake.texi b/doc/automake.texi
index 9024888..e186489 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6666,8 +6666,9 @@ is as follows:
@cindex Support for Java
Automake includes support for natively compiled Java, using @command{gcj},
-the Java front end to the GNU Compiler Collection, as well as some preliminary
-support for compiling Java to bytecode (see @pxref{Java}).
+the Java front end to the GNU Compiler Collection (preliminary support
+for compiling Java to bytecode using the @command{javac} compiler is
+also present; @pxref{Java}).
Any package including Java code to be compiled must define the output
variable @code{GCJ} in @file{configure.ac}; the variable @code{GCJFLAGS}
@@ -7535,9 +7536,9 @@ libtool, The Libtool Manual}) with the @code{LTLIBRARIES}
primary.
@cindex @code{JAVA} primary, defined
@cindex Primary variable, @code{JAVA}
-Automake provides some minimal support for Java compilation with the
-@code{JAVA} primary, as well as support for compiling Java to native
-machine code (see @pxref{Java Support}).
+Automake provides some minimal support for Java bytecode compilation with
+the @code{JAVA} primary (in addition to the support for compiling Java to
+native machine code; @pxref{Java Support}).
Any @file{.java} files listed in a @code{_JAVA} variable will be
compiled with @code{JAVAC} at build time. By default, @file{.java}
-*-*-*-
The amended patch is attached. I'll wait until tomorrow for objections
before pushing it (to maint).
Regards,
Stefano
From a7b07aac740bdfbec51a058f8a6db754db95c3b6 Mon Sep 17 00:00:00 2001
Message-Id: <a7b07aac740bdfbec51a058f8a6db754db95c3b6.1310822270.git.stefano.lattar...@gmail.com>
From: Benoit Sigoure <tsuna...@gmail.com>
Date: Fri, 15 Jul 2011 16:49:45 -0700
Subject: [PATCH] docs: add references between the 2 sections on java support
* doc/automake.texi (Java Support, Java): Add cross-references.
---
ChangeLog | 5 +++++
doc/automake.texi | 11 +++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f2db655..0c01f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15 Benoit Sigoure <tsuna...@gmail.com>
+
+ docs: add references between the 2 sections on java support
+ * doc/automake.texi (Java Support, Java): Add cross-references.
+
2011-07-08 Stefano Lattarini <stefano.lattar...@gmail.com>
tests: fix weakness in 'tests-environment-backcompat.test'
diff --git a/doc/automake.texi b/doc/automake.texi
index 5e8ade8..e186489 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6665,8 +6665,10 @@ is as follows:
@cindex Java support
@cindex Support for Java
-Automake includes support for compiled Java, using @command{gcj}, the Java
-front end to the GNU Compiler Collection.
+Automake includes support for natively compiled Java, using @command{gcj},
+the Java front end to the GNU Compiler Collection (preliminary support
+for compiling Java to bytecode using the @command{javac} compiler is
+also present; @pxref{Java}).
Any package including Java code to be compiled must define the output
variable @code{GCJ} in @file{configure.ac}; the variable @code{GCJFLAGS}
@@ -7534,8 +7536,9 @@ libtool, The Libtool Manual}) with the @code{LTLIBRARIES} primary.
@cindex @code{JAVA} primary, defined
@cindex Primary variable, @code{JAVA}
-Automake provides some minimal support for Java compilation with the
-@code{JAVA} primary.
+Automake provides some minimal support for Java bytecode compilation with
+the @code{JAVA} primary (in addition to the support for compiling Java to
+native machine code; @pxref{Java Support}).
Any @file{.java} files listed in a @code{_JAVA} variable will be
compiled with @code{JAVAC} at build time. By default, @file{.java}
--
1.7.2.3
