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.

4 files changed, 15 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 278b0d0c7..40e0ed99e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	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  <stefano.lattarini@gmail.com>
 
 	Fix spurious failures in `silent*.test' for $CC != gcc
diff --git a/NEWS b/NEWS
index 649bee9bc..5e243130a 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 5c44767e4..27904f01e 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 355f9d288..d1b173caf 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