[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-420-g9201a31

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9201a314dbbb4793023a069d8530bc37c34b09b7

The branch, maint has been updated
       via  9201a314dbbb4793023a069d8530bc37c34b09b7 (commit)
      from  158e1d9b450600f15226eefc5b7a026478e1500b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9201a314dbbb4793023a069d8530bc37c34b09b7
Author: Benoit Sigoure <address@hidden>
Date:   Fri Jul 15 16:49:45 2011 -0700

    docs: add references between the 2 sections on java support
    
    * doc/automake.texi (Java Support, Java): Add cross-references.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    5 +++++
 doc/automake.texi |   11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eddefc2..c08324b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Benoit Sigoure  <address@hidden>
+
+       docs: add references between the 2 sections on java support
+       * doc/automake.texi (Java Support, Java): Add cross-references.
+
 2011-07-20  Ralf Wildenhues  <address@hidden>
 
        Sync auxiliary files from upstream.
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
address@hidden 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}


hooks/post-receive
-- 
GNU Automake