* automake.texi (Program variables): Document AM_CPPFLAGS.

	Deprecate INCLUDES.
	(Java Support): Document AM_GCJFLAGS.
	(Support for Other Languages): Removed `fixme'; added link to
	suffix rule handling.

diff --git a/ChangeLog b/ChangeLog
index 4823977d6844ef7d24e760731a2eadf4ab2fbb11..63382268f68f5826d097fe5cbaf7cd98a2d69014 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-06-11  Tom Tromey  <tromey@redhat.com>
 
+       * automake.texi (Program variables): Document AM_CPPFLAGS.
+       Deprecate INCLUDES.
+       (Java Support): Document AM_GCJFLAGS.
+       (Support for Other Languages): Removed `fixme'; added link to
+       suffix rule handling.
+
        * automake.texi (Program and Library Variables): Document _LIBADD,
        _LDADD, _LDFLAGS, _AR, and _DEPENDENCIES.
 

diff --git a/automake.texi b/automake.texi
index 6c7c3dd072bdfe09a6c1b1a8744e49e7f0d6e4c7..466d6b8c1fea54be93e223f0b358d03444ae4388 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -2025,18 +2025,21 @@ Some variables are inherited from Autoconf; these are @code{CC},
 There are some additional variables which Automake itself defines:
 
 @vtable @code
-@item INCLUDES
-A list of @samp{-I} options.  This can be set in your @file{Makefile.am}
-if you have special directories you want to look in.  Automake already
-provides some @samp{-I} options automatically.  In particular it
-generates @samp{-I$(srcdir)}, @samp{-I.}, and a @samp{-I} pointing to
-the directory holding @file{config.h} (if you've used
+@item AM_CPPFLAGS
+The contents of this macro are passed to every compilation which invokes
+the C preprocessor; it is a list of arguments to the preprocessor.  For
+instance, @samp{-I} and @samp{-D} options should be listed here.
+
+Automake already provides some @samp{-I} options automatically.  In
+particular it generates @samp{-I$(srcdir)}, @samp{-I.}, and a @samp{-I}
+pointing to the directory holding @file{config.h} (if you've used
 @code{AC_CONFIG_HEADER} or @code{AM_CONFIG_HEADER}).  You can disable
 the default @samp{-I} options using the @samp{nostdinc} option.
 
-@code{INCLUDES} can actually be used for other @code{cpp} options
-besides @samp{-I}.  For instance, it is sometimes used to pass arbitrary
-@samp{-D} options to the compiler.
+@item INCLUDES
+This does the same job as @samp{AM_CPPFLAGS}.  It is an older name for
+the same functionality.  This macro is deprecated; we suggest using
+@samp{AM_CPPFLAGS} instead.
 
 @item COMPILE
 This is the command used to actually compile a C source file.  The
@@ -2455,9 +2458,20 @@ must also be defined somehow (either in @file{configure.in} or
 @file{Makefile.am}).  The simplest way to do this is to use the
 @code{AM_PROG_GCJ} macro.
 
+@vindex GCJFLAGS
+
 By default, programs including Java source files are linked with
 @code{gcj}.
 
+As always, the contents of @samp{AM_GCJFLAGS} are passed to every
+compilation invoking @code{gcj} (in its role as an ahead-of-time
+compiler -- when invoking it to create @file{.class} files,
+@samp{AM_JAVACFLAGS} is used instead).  If it is necessary to pass
+options to @code{gcj} from @file{Makefile.am}, this macro, and not the
+user macro @samp{GCJFLAGS}, should be used.
+
+@vindex AM_GCJFLAGS
+
 
 @node Support for Other Languages, ANSI, Java Support, Programs
 @comment  node-name,  next,  previous,  up
@@ -2468,7 +2482,8 @@ Support}), Fortran 77 (@pxref{Fortran 77 Support}), and Java
 (@pxref{Java Support}).  There is only rudimentary support for other
 languages, support for which will be improved based on user demand.
 
-@c FIXME: mention suffix rule processing here.
+Some limited support for adding your own languages is available via the
+suffix rule handling; see @ref{Suffixes}.
 
 
 @node ANSI, Dependencies, Support for Other Languages, Programs