removed --strictness

diff --git a/Makefile.in b/Makefile.in
index f533eeb..50a30bb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ $(srcdir)/aclocal.m4: configure.in
        cd $(srcdir) && aclocal
 
 $(srcdir)/Makefile.in: Makefile.am configure.in
-       cd $(srcdir) && automake --strictness=gnits Makefile
+       cd $(srcdir) && automake --gnits Makefile
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
@@ -339,7 +339,7 @@ distdir: $(DISTFILES)
        -chmod 755 $(distdir)
        here=`pwd`; distdir=`cd $(distdir) && pwd` \
          && cd $(srcdir) \
-         && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness=gnits
+         && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --gnits
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/automake.in b/automake.in
index 619219f..eaaeab3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -309,10 +309,6 @@ sub parse_arguments
            shift (@arglist);
            $srcdir_name = $arglist[0];
        }
-       elsif ($arglist[0] =~ /^--strictness=(.+)$/)
-       {
-           &set_strictness ($1);
-       }
        elsif ($arglist[0] eq '--gnu')
        {
            &set_strictness ('gnu');
@@ -329,12 +325,6 @@ sub parse_arguments
        {
            &set_strictness ('foreign');
        }
-       elsif ($arglist[0] eq '--strictness' || $arglist[0] eq '-s')
-       {
-           &require_argument (@arglist);
-           shift (@arglist);
-           &set_strictness ($arglist[0]);
-       }
        elsif ($arglist[0] eq '--include-deps' || $arglist[0] eq '-i')
        {
            $cmdline_use_dependencies = 0;
@@ -1808,10 +1798,9 @@ sub handle_dist_worker
                 # weirdness.
                 '      here=`pwd`; distdir=`cd $(distdir) && pwd` \\
          && cd $(srcdir) \\
-         && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness='
+         && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir '
                 # Set strictness of output.
-                . $strictness_name
-                . ($cygnus_mode ? ' --cygnus' : '')
+                . ($cygnus_mode ? ' --cygnus' : ('--' . $strictness_name))
                 . "\n"
                 );
        }
@@ -2296,8 +2285,9 @@ sub handle_configure
        if &variable_defined ('SUBDIRS') && ! $seen_make_set;
 
     local ($top_reldir);
-    local ($xform) = ('s/\@ARGS\@/--strictness=' . $strictness_name
-                     . ($cygnus_mode ? ' --cygnus' : '')
+    local ($xform) = ('s/\@ARGS\@/'
+                     . ($cygnus_mode ? ' --cygnus'
+                        : ('--' . $strictness_name))
                      . '/;');
     if ($relative_dir ne '.')
     {
@@ -3860,17 +3850,15 @@ sub initialize_global_constants
   --amdir=DIR           directory storing config files
   --build-dir=DIR       directory where build being done (for dependencies)
   --cygnus              assume program is part of Cygnus-style tree
-  --foreign             same as --strictness=foreign
-  --gnits               same as --strictness=gnits
-  --gnu                 same as --strictness=gnu
+  --foreign             set strictness to foreign
+  --gnits               set strictness to gnits
+  --gnu                 set strictness to gnu
   --help                print this help, then exit
   -i, --include-deps    include generated dependencies in Makefile.in
   --no-force            only update Makefile.in's that are out of date
   -o DIR, --output-dir=DIR
                         put generated Makefile.in's into DIR
   --srcdir-name=DIR     name used for srcdir (for dependencies)
-  -s LEVEL, --strictness=LEVEL
-                        set strictness level.  LEVEL is foreign, gnu, gnits
   -v, --verbose         verbosely list files processed
   --version             print version number, then exit\n";
 

diff --git a/automake.texi b/automake.texi
index 3d896a1..1a83a33 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -195,13 +195,16 @@ including dependencies into a @file{Makefile.in} generated by @code{make
 dist}; it should not be used otherwise.
 
 @item --foreign
-An alias for @samp{--strictness=foreign}.
+Set the global strictness to @samp{foreign}.  @xref{Generalities} for
+more information.
 
 @item --gnits
-An alias for @samp{--strictness=gnits}.
+Set the global strictness to @samp{gnits}.  @xref{Generalities} for
+more information.
 
 @item --gnu
-An alias for @samp{--strictness=gnu}.
+Set the global strictness to @samp{gnu}.  @xref{Generalities} for
+more information.
 
 @item --help
 Print a summary of the command line options and exit.
@@ -226,12 +229,6 @@ build.  This option is used when including dependencies into a
 @file{Makefile.in} generated by @code{make dist}; it should not be used
 otherwise.
 
-@item -s @var{level}
-@item --strictness=@var{level}
-Set the global strictness to @var{level}; this can be overridden in each
-@file{Makefile.am} if required.  @xref{Generalities} for more
-information.
-
 @item -v
 @item --verbose
 Cause Automake to print information about which files are being read or
@@ -1631,7 +1628,7 @@ Various features of Automake can be controlled by options in the
 @item @code{gnits}
 @itemx @code{gnu}
 @itemx @code{foreign}
-The same as the corresponding @samp{--strictness} option.
+Set the strictness as appropriate.
 
 @item @code{no-installman}
 The generated @file{Makefile.in} will not cause man pages to be

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 258d2d5..ead82f7 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -67,7 +67,7 @@ default: all
 .SUFFIXES:
 
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
-       cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile
+       cd $(top_srcdir) && automake --gnits $(subdir)/Makefile
 
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
        cd $(top_builddir) \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 383e1e8..51d07ac 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -77,7 +77,7 @@ default: all
 .SUFFIXES:
 
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
-       cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile
+       cd $(top_srcdir) && automake --gnits $(subdir)/Makefile
 
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
        cd $(top_builddir) \

diff --git a/version.texi b/version.texi
index 17eb9ff..6d473ec 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 28 November 1996
+@set UPDATED 4 December 1996
 @set EDITION 1.1k
 @set VERSION 1.1k