From 121c5a1bf86d7af6505d5a75d09e48c0a56060d0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 7 Apr 1997 23:45:35 +0000 Subject: [PATCH] version check fix --- ChangeLog | 5 +++++ TODO | 8 -------- automake.in | 2 +- automake.texi | 22 ++++++++++++++++++---- stamp-vti | 2 +- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/version2.test | 24 ++++++++++++++++++++++++ version.texi | 2 +- 10 files changed, 56 insertions(+), 17 deletions(-) create mode 100755 tests/version2.test diff --git a/ChangeLog b/ChangeLog index 4923639c8..e6ea303b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 7 17:40:18 1997 Tom Tromey + + * automake.in (AM_INIT_AUTOMAKE_PATTERN): Fixed for new 3rd arg. + Test version2.test. + Thu Apr 3 19:07:59 1997 Tom Tromey * Released 1.1n. diff --git a/TODO b/TODO index 44201d4ea..e5daedfca 100644 --- 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 6f686c874..732b2bf57 100755 --- 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 16543aaf0..a2ab86829 100644 --- 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 b5d034171..bc64b3cc3 100644 --- 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 8109eb926..f0da39b0d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 7 17:35:49 1997 Tom Tromey + + * version2.test: New file. + Wed Apr 2 00:12:26 1997 Tom Tromey * ldadd.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ad2634ee..a92440f31 100644 --- 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 0631497fa..b83a12fe4 100644 --- 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 index 000000000..f70949713 --- /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 b5d034171..bc64b3cc3 100644 --- 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 -- 2.47.3