version check fix

diff --git a/ChangeLog b/ChangeLog
index 4923639c83e6a1ba1628bd75d4ef58f50f2c453d..e6ea303b734a8313cd90c72c9e532b9041e2bff6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  7 17:40:18 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (AM_INIT_AUTOMAKE_PATTERN): Fixed for new 3rd arg.
+       Test version2.test.
+
 Thu Apr  3 19:07:59 1997  Tom Tromey  <tromey@cygnus.com>
 
        * Released 1.1n.

diff --git a/TODO b/TODO
index 44201d4ea0021d2f25fd107c2bb6f2eb5bb389a9..e5daedfcae74df8b3491486caddb7227ecc1d1b7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -358,10 +358,6 @@ what goes in AC_CONFIG_AUX_DIR
 
 TEXINFO_TEX
 
-SUBDIR entry must be direct subdir of this dir
-
-C++ -vs- yacc/lex
-
 multi-":" mode in AC_OUTPUT -- automake only looks at the first file
     also a note on how a .am file is found in this case
 
@@ -397,10 +393,6 @@ This is insufficiently clear
 must document the targets required for integration with
 non-automake-using subdirs
 
-use of (eg) EXTRA_PROGRAMS is not very clear right now
-document EXTRA_foo_SOURCES
-document why EXTRA_* vars must be statically knowable
-
 document the "make SHELL='/bin/sh -x'" trick for debugging
 
 section on relationship to GNU make

diff --git a/automake.in b/automake.in
index 6f686c87415a4a634516cad398ad39ddba2e21f6..732b2bf57993cf067ece3636b4bce29ddc9c0ed1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -47,7 +47,7 @@ $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
 # Some regular expressions.  One reason to put them here is that it
 # makes indentation work better in Emacs.
 $AC_CONFIG_AUX_DIR_PATTERN = "AC_CONFIG_AUX_DIR\\(([^)]+)\\)";
-$AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^)]+)\\)";
+$AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^,)]+)[,)]";
 $AM_PACKAGE_VERSION_PATTERN = "^\\s*\\[?([^]\\s]+)\\]?\\s*\$";
 # Note that there is no AC_PATH_TOOL.  But we don't really care.
 $AC_CHECK_PATTERN = "AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\\(\\[?(\\w+)";

diff --git a/automake.texi b/automake.texi
index 16543aaf0aaf416bbade0a7bd3c676fbcb7ce63c..a2ab86829f200473375c715b4b3a1b1dc454ee34 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1126,7 +1126,10 @@ the generated @file{Makefile} will run both locally and in all specified
 subdirectories.  Note that the directories listed in @code{SUBDIRS} are
 not required to contain @file{Makefile.am}s; only @file{Makefile}s
 (after configuration).  This allows inclusion of libraries from packages
-which do not use Automake (such as @code{gettext}).
+which do not use Automake (such as @code{gettext}).  The directories
+mentioned in @code{SUBDIRS} must be direct children of the current
+directory.  For instance, you cannot put @samp{src/subdir} into
+@code{SUBDIRS}.
 
 In a deep package, the top-level @file{Makefile.am} is often very short.
 For instance, here is the @file{Makefile.am} from the Hello
@@ -1210,9 +1213,20 @@ should not include the header file generated by @file{configure} in an
 (@samp{.l}) and yacc (@samp{.y}) files can also be listed; see @ref{Yacc
 and Lex}.
 
-Sometimes it is useful to determine the programs that are to be built at
-configure time.  For instance, GNU @code{cpio} only builds @code{mt} and
-@code{rmt} under special circumstances.
+Automake must know all the source files that could possibly go into a
+program, even if not all the files are built in every circumstance.
+Any files which are only conditionally built should be listed in the
+appropriate @samp{EXTRA_} variable.  For instance, if
+@file{hello-linux.c} were conditionally included in @code{hello}, the
+@file{Makefile.am} would contain:
+
+@example
+EXTRA_hello_SOURCES = hello-linux.c
+@end example
+
+Similarly, sometimes it is useful to determine the programs that are to
+be built at configure time.  For instance, GNU @code{cpio} only builds
+@code{mt} and @code{rmt} under special circumstances.
 
 In this case, you must notify @code{automake} of all the programs that
 can possibly be built, but at the same time cause the generated

diff --git a/stamp-vti b/stamp-vti
index b5d0341713d45f9650887d4eef1ece08a05d2c7a..bc64b3cc34ca9dd143d9ce1787bb7a29cae16f35 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 3 April 1997
+@set UPDATED 4 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8109eb9263a46f983d017ba9da04a998622f7c2d..f0da39b0df8f0a21ad05f2ba63562feca2b804dd 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr  7 17:35:49 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * version2.test: New file.
+
 Wed Apr  2 00:12:26 1997  Tom Tromey  <tromey@cygnus.com>
 
        * ldadd.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ad2634eed4843518a68e635e0b47d4d044cfe58..a92440f3132f0cd000647f5c746824ad7eb4c572 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,7 @@ colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
 cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test
+ldadd.test version2.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0631497fa631659feec7377028f1187c242c78d0..b83a12fe4c34b837f58638ee2c96fee0a601170b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -79,7 +79,7 @@ colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
 cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test
+ldadd.test version2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/version2.test b/tests/version2.test
new file mode 100755 (executable)
index 0000000..f709497
--- /dev/null
+++ b/tests/version2.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in
+# version.  From Joel Weber.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AM_INIT_AUTOMAKE([sh-utils], 1.12o, no)
+AC_OUTPUT(Makefile)
+END
+
+: > Makefile.am
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$AUTOMAKE --gnits

diff --git a/version.texi b/version.texi
index b5d0341713d45f9650887d4eef1ece08a05d2c7a..bc64b3cc34ca9dd143d9ce1787bb7a29cae16f35 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 3 April 1997
+@set UPDATED 4 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n