Can put version in AUTOMAKE_OPTIONS. Bug fixes

diff --git a/ChangeLog b/ChangeLog
index b60b8c088546eecebd4fe6ef9a268b888d73b756..d1c25d9a9606239f0721f94a2345bf2d5d00a96c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Sun Feb 11 15:55:15 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_texinfo): Push $(INFO_DEPS), not 'info',
+       onto @all.
+       (handle_options): Handle version number.
+
        * automake.in ($maint_charset, $dist_charset): New variables.
        (initialize_per_input): Init $local_maint_charset.
        (handle_dist): Handle DIST_CHARSET and MAINT_CHARSET.

diff --git a/Makefile.in b/Makefile.in
index c9c669d77aa6ec3ac1c3f2b19243eba405d8a1de..d14edad4c0a6b764575e696af764c2604336aa3f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,7 +276,7 @@ dist: $(DEP_DISTFILES)
        chmod -R a+r $(distdir)
        tar chozf $(distdir).tar.gz $(distdir)
        rm -rf $(distdir)
-all: info $(SCRIPTS) $(DATA) all-recursive
+all: $(INFO_DEPS) $(SCRIPTS) $(DATA) all-recursive
 
 info: $(INFO_DEPS) info-recursive
 

diff --git a/NEWS b/NEWS
index 70629774f7ca49f7125ba5dada2f2cd6ff384f4c..05814e315ae16d4a2e351a986241b91cc105b345 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ New in 0.30:
 * Automatically adds -I options for $(srcdir), ".", and path to config.h
 * Doesn't print anything when running
 * Beginnings of MAINT_CHARSET support
+* Can specify version in AUTOMAKE_OPTIONS
 \f
 New in 0.29:
 * Many bug fixes

diff --git a/TODO b/TODO
index 502d07772035f6fc6a4f0d2e44f91834339052a7..1eca2e6216fd0a3fbd2d68eb0f4963757655e7db 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,9 +5,6 @@ Top priorities:
 * Rewrite clean targets.
 * Expand test suite.
 
-Bug: "make" in automake dir causes subdir to be built twice (by info
-and by all).  Why?
-
 Consider using Ulrich's test suite idea
 If so, also allow support for Cygnus-style dejagnu-based test suites
 via an option
@@ -23,7 +20,9 @@ to the no-dependencies option; maybe it still should?  Note also that
 each Makefile.am must be rewritten at "make dist" time if
 MAINT_CHARSET and DIST_CHARSET are not identical.
 
-Handle dist-zoo and dist-zip.
+Handle dist-zoo and dist-zip.  Generally add more DOS support.  Maybe
+run "doschk" (why isn't this merged with "pathchk"?) when doing a
+dist.  Do whatever else François says here...
 
 Add support for html via an option.  Use texi2html.  Use
 "html_TEXINFOS", and htmldir = .../html.  Include html files in

diff --git a/automake.in b/automake.in
index f1aad937b7d970c576bdb236707125902a3e3ea7..e809277f37536969836afa0b48be0933cde0fda4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -27,7 +27,8 @@ eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
 # Perl reimplementation by Tom Tromey <tromey@drip.colorado.edu>.
 
 
-# Parameters set by configure.  Not to be changed.
+# Parameters set by configure.  Not to be changed.  NOTE: assign
+# VERSION as string so that eg version 0.30 will print correctly.
 $VERSION = "@VERSION@";
 $prefix = "@prefix@";
 $am_dir = "@datadir@/@PACKAGE@";
@@ -345,6 +346,16 @@ sub handle_options
        {
            $use_dependencies = 0;
        }
+       elsif (/[0-9]+\.?[0-9]+/)
+       {
+           # Got a version number.  Is the syntax too strict?
+           if ($VERSION < $_)
+           {
+               &am_error ("require version $_, only have $VERSION");
+               # FIXME -- what else to do?
+               exit 1;
+           }
+       }
        else
        {
            &am_error ('option ', $_, 'not recognized');
@@ -737,9 +748,12 @@ sub handle_texinfo
     push (@info, '$(INFO_DEPS)');
     push (@dvi, '$(DVIS)');
     push (@installdirs, '$(infodir)');
-    # Make sure documentation is made and installed first.
     unshift (@install_data, 'install-info');
-    unshift (@all, 'info');
+
+    # Make sure documentation is made and installed first.  Use
+    # $(INFO_DEPS), not 'info', because otherwise recursive makes get
+    # run twice during "make all".  FIXME add test case.
+    unshift (@all, '$(INFO_DEPS)');
 
     $output_vars .= ("INFOS = " . join (' ', @infos_list) . "\n"
                     . "INFO_DEPS = " . join (' ', @info_deps_list)  . "\n"

diff --git a/automake.texi b/automake.texi
index 200ce8bba9de4d6d7c1f546e54be9fcbef23d59d..72dffbfc1ad242f0d538d21b3ba557d3f27c5773 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -761,6 +761,11 @@ This is similar to using @samp{--include-deps} on the command line, but
 is useful for those situations where you don't have the necessary bits
 to make automatic dependency tracking work @xref{Dependencies}.  In this
 case the effect is to effectively disable automatic dependency tracking.
+
+@item version
+A version number (eg @samp{0.30}) can be specified.  If Automake is not
+newer than the version specified, creation of the @file{Makefile.in}
+will be suppressed.
 @end table
 
 @node Extending

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ec04ba4f2a28b5af6a6be10b959be428ede6daaf..a4b76e0a9edc3a9acced1839e89daa2fe3ca93fe 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.30 from Makefile.am
+# Makefile.in generated automatically by automake 0.3 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation

diff --git a/version.texi b/version.texi
index d2d00e8f85262a41724478e26e59d331f701603f..fb98820f5b6a17f5546841406f812b91fd084d64 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 8 February
+@set UPDATED 11 February
 @set EDITION 0.30
 @set VERSION 0.30