[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-484-g4fa248a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=4fa248abc6380eb4d848707c975d633c7c6801db

The branch, master has been updated
       via  4fa248abc6380eb4d848707c975d633c7c6801db (commit)
       via  bd322a8535f5ff320dc6852765d34a769c2d2140 (commit)
       via  fdb2764f70ff5f3aed51a61baf3b72511ffb9d11 (commit)
      from  acb5a214c900cbe1bdfcbb59c063db741856e6eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4fa248abc6380eb4d848707c975d633c7c6801db
Merge: bd322a8 fdb2764
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 27 11:07:18 2010 +0100

    Merge branch 'maint'

commit bd322a8535f5ff320dc6852765d34a769c2d2140
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 26 16:04:06 2010 +0100

    Remove long-deprecated options --Werror and --Wno-error.
    
    These options has been deprecated at least since commit
    "Release-1-6-1b-35-gc037f20", dated 2002-07-06.
    
    * automake.in (parse_arguments): Do not recognize anymore options
    `--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
    and `-Wno-error'.
    * tests/werror.test: Update: use `-Werror' instead of `--Werror'.
    * NEWS: Update.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   13 ++++++++++++-
 NEWS              |    3 ++-
 automake.in       |    4 ----
 tests/werror.test |    4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 278b0d0..965a48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-26  Stefano Lattarini  <address@hidden>
+
+       Remove long-deprecated options --Werror and --Wno-error.
+       These options has been deprecated at least since commit
+       "Release-1-6-1b-35-gc037f20", dated 2002-07-06.
+       * automake.in (parse_arguments): Do not recognize anymore options
+       `--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
+       and `-Wno-error'.
+       * tests/werror.test: Update: use `-Werror' instead of `--Werror'.
+       * NEWS: Update.
+
 2010-11-25  Stefano Lattarini  <address@hidden>
 
        Fix spurious failures in `silent*.test' for $CC != gcc
@@ -167,7 +178,7 @@
 
        Fix regression in ansi.test (failure on AIX 5.3).
        * tests/ansi.test: Remove redundant hackish check done using a
-       hand-postprocessed Makefile.in.  This checks worked by setting
+       hand-postprocessed Makefile.in.  This check worked by setting
        the `$(SHELL)' macro on the command line of make, but this is
        not supported by the AIX 5.3 make implementation.
        This bug has been lurking for a long time, and was activated by
diff --git a/NEWS b/NEWS
index 649bee9..5e24313 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,8 @@ New in 1.11a:
 * Changes to automake:
 
   - automake now generates silenced rules for texinfo outputs.
-  - The deprecated option `--output-dir' has been removed.
+  - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
+    have been removed.
 
 * New targets:
 
diff --git a/automake.in b/automake.in
index 5c44767..27904f0 100644
--- a/automake.in
+++ b/automake.in
@@ -8464,10 +8464,6 @@ sub parse_arguments ()
      'c|copy'          => \$copy_missing,
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
      'W|warnings=s'     => \&parse_warnings,
-     # These long options (--Werror and --Wno-error) for backward
-     # compatibility.  Use -Werror and -Wno-error today.
-     'Werror'           => sub { parse_warnings 'W', 'error'; },
-     'Wno-error'        => sub { parse_warnings 'W', 'no-error'; },
      );
   use Getopt::Long;
   Getopt::Long::config ("bundling", "pass_through");
diff --git a/tests/werror.test b/tests/werror.test
index 355f9d2..d1b173c 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure --Werror and --add-missing work together.
+# Test to make sure -Werror and --add-missing work together.
 
 . ./defs || Exit 1
 
@@ -25,4 +25,4 @@ set -e
 rm -f install-sh depcomp missing mkinstalldirs
 
 $ACLOCAL
-$AUTOMAKE --Werror --add-missing
+$AUTOMAKE -Werror --add-missing


hooks/post-receive
-- 
GNU Automake