* doc/automake.texi (Built sources example): Explain what

nodist_foo_SOURCES is (not) useful to, and use it in all the
examples.
(Tags): Mention nodist_noinst_HEADERS and nodist_prog_SOURCES.
Suggested by Akim Demaille.

diff --git a/ChangeLog b/ChangeLog
index f4e3b809681cd75a01c836d007c9cdd800bcfbe8..ca3208029d5a796164adca238e25f3d0ddfa68fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-31  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * doc/automake.texi (Built sources example): Explain what
+       nodist_foo_SOURCES is (not) useful to, and use it in all the
+       examples.
+       (Tags): Mention nodist_noinst_HEADERS and nodist_prog_SOURCES.
+       Suggested by Akim Demaille.
+
 2004-05-23  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * configure.ac, NEWS: Bump version to 1.8c.

diff --git a/doc/automake.texi b/doc/automake.texi
index 2822ef5d39bf926972b7efe891f69372e5198019..cdcd03d4e813963ca6d1c4bfab4f5c1e9df3251f 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4486,6 +4486,14 @@ foo.c:2: bindir.h: No such file or directory
 make: *** [foo.o] Error 1
 @end example
 
+In this example @file{bindir.h} is not distributed, not installed, and
+it is not even being built on-time.  One may wonder what the
+@code{nodist_foo_SOURCES = bindir.h} line has any use at all.  This
+line simply states that @file{bindir.h} is a source of @code{foo}, so
+for instance it should be inspected while generating tags
+(@pxref{Tags}).  In other words, it does not help our present problem,
+and the build would fail identically without it.
+
 @unnumberedsubsec Using @code{BUILT_SOURCES}
 
 A solution is to require @file{bindir.h} to be built before anything
@@ -4494,6 +4502,7 @@ else.  This is what @code{BUILT_SOURCES} is meant for (@pxref{Sources}).
 @example
 bin_PROGRAMS = foo
 foo_SOURCES = foo.c
+nodist_foo_SOURCES = bindir.h
 BUILT_SOURCES = bindir.h
 CLEANFILES = bindir.h
 bindir.h: Makefile
@@ -4545,6 +4554,7 @@ the @file{Makefile.am}.
 @example
 bin_PROGRAMS = foo
 foo_SOURCES = foo.c
+nodist_foo_SOURCES = bindir.h
 foo.$(OBJEXT): bindir.h
 CLEANFILES = bindir.h
 bindir.h: Makefile
@@ -6051,9 +6061,14 @@ There are a few rules and variables that didn't fit anywhere else.
 Automake will generate rules to generate @file{TAGS} files for use with
 GNU Emacs under some circumstances.
 
+@trindex tags
 If any C, C++ or Fortran 77 source code or headers are present, then
 @code{tags} and @code{TAGS} rules will be generated for the directory.
-@trindex tags
+All files listed using the @code{_SOURCES}, @code{_HEADERS}, and
+@code{_LISP} primaries will be used to generate tags.  Note that
+generated source files that are not distributed must be declared in
+variables like @code{nodist_noinst_HEADERS} or
+@code{nodist_@var{prog}_SOURCES} or they will be ignored.
 
 At the topmost directory of a multi-directory package, a @code{tags}
 rule will be output which, when run, will generate a @file{TAGS} file

diff --git a/doc/stamp-vti b/doc/stamp-vti
index bd591b1f72d3a972411f944371a9a58ec104e342..0c5955f6f1b0d0f7b67735d2407c30f191c33b0d 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 22 May 2004
+@set UPDATED 31 May 2004
 @set UPDATED-MONTH May 2004
 @set EDITION 1.8c
 @set VERSION 1.8c

diff --git a/doc/version.texi b/doc/version.texi
index bd591b1f72d3a972411f944371a9a58ec104e342..0c5955f6f1b0d0f7b67735d2407c30f191c33b0d 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 22 May 2004
+@set UPDATED 31 May 2004
 @set UPDATED-MONTH May 2004
 @set EDITION 1.8c
 @set VERSION 1.8c