[PATCH 1/2] Remove obsolete automake option `--output-directory'.

[Stefano Lattarini]

This option has been deprecated since version 1.7 (2002/2003).

* automake.in ($output_directory): Define to `.' unconditionally.
(parse_arguments): Remove handling of equivalent options `-o' and
`--output-directory'.
* tests/outdir.test: Removed.
* tests/no-outdir-option.test: New test.
* tests/Makefile.am (TESTS): Updated.
---
 ChangeLog                                    |   11 +++++++++++
 automake.in                                  |   13 +------------
 tests/Makefile.am                            |    2 +-
 tests/Makefile.in                            |    2 +-
 tests/{outdir.test => no-outdir-option.test} |   19 ++++++++-----------
 5 files changed, 22 insertions(+), 25 deletions(-)
 rename tests/{outdir.test => no-outdir-option.test} (66%)

From c02ce7c00b451b172f767df324d8da197ab80129 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Thu, 18 Nov 2010 17:59:14 +0100
Subject: [PATCH 1/2] Remove obsolete automake option `--output-directory'.

This option has been deprecated since version 1.7 (2002/2003).

* automake.in ($output_directory): Define to `.' unconditionally.
(parse_arguments): Remove handling of equivalent options `-o' and
`--output-directory'.
* tests/outdir.test: Removed.
* tests/no-outdir-option.test: New test.
* tests/Makefile.am (TESTS): Updated.
---
 ChangeLog                                    |   11 +++++++++++
 automake.in                                  |   13 +------------
 tests/Makefile.am                            |    2 +-
 tests/Makefile.in                            |    2 +-
 tests/{outdir.test => no-outdir-option.test} |   19 ++++++++-----------
 5 files changed, 22 insertions(+), 25 deletions(-)
 rename tests/{outdir.test => no-outdir-option.test} (66%)

diff --git a/ChangeLog b/ChangeLog
index a78cdd8..269df31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-18  Stefano Lattarini  <address@hidden>
+
+       Remove obsolete automake option `--output-directory'.
+       This option has been deprecated since version 1.7 (2002/2003).
+       * automake.in ($output_directory): Define to `.' unconditionally.
+       (parse_arguments): Remove handling of equivalent options `-o' and
+       `--output-directory'.
+       * tests/outdir.test: Removed.
+       * tests/no-outdir-option.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+
 2010-11-17  Stefano Lattarini  <address@hidden>
 
        Fix spurious failures of silent-rules tests with Sun Fortran.
diff --git a/automake.in b/automake.in
index db45e52..609e100 100644
--- a/automake.in
+++ b/automake.in
@@ -332,7 +332,7 @@ my @config_links = ();
 
 # Directory where output files go.  Actually, output files are
 # relative to this directory.
-my $output_directory;
+my $output_directory = '.';
 
 # List of Makefile.am's to process, and their corresponding outputs.
 my @input_files = ();
@@ -8469,7 +8469,6 @@ sub parse_arguments ()
                                                    $cli_where); },
      'no-force'        => sub { $force_generation = 0; },
      'f|force-missing'  => \$force_missing,
-     'o|output-dir=s'  => \$output_directory,
      'a|add-missing'   => \$add_missing,
      'c|copy'          => \$copy_missing,
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
@@ -8506,16 +8505,6 @@ sub parse_arguments ()
   Getopt::Long::GetOptions %cli_options, 'version' => sub {}, 'help' => sub {}
     or exit 1;
 
-  if (defined $output_directory)
-    {
-      msg 'obsolete', "`--output-dir' is deprecated";
-    }
-  else
-    {
-      # In the next release we'll remove this entirely.
-      $output_directory = '.';
-    }
-
   return unless @ARGV;
 
   if ($ARGV[0] =~ /^-./)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f560b3..4c6b636 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -583,6 +583,7 @@ mkinst3.test \
 mmode.test \
 mmodely.test \
 multlib.test \
+no-outdir-option.test \
 nobase.test \
 nobase-libtool.test \
 nobase-python.test \
@@ -607,7 +608,6 @@ objc2.test \
 obsolete.test \
 oldvars.test \
 order.test \
-outdir.test \
 output.test \
 output2.test \
 output3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2cf97a0..4efa6e4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -845,6 +845,7 @@ mkinst3.test \
 mmode.test \
 mmodely.test \
 multlib.test \
+no-outdir-option.test \
 nobase.test \
 nobase-libtool.test \
 nobase-python.test \
@@ -869,7 +870,6 @@ objc2.test \
 obsolete.test \
 oldvars.test \
 order.test \
-outdir.test \
 output.test \
 output2.test \
 output3.test \
diff --git a/tests/outdir.test b/tests/no-outdir-option.test
similarity index 66%
rename from tests/outdir.test
rename to tests/no-outdir-option.test
index 4bafb4e..827e318 100755
--- a/tests/outdir.test
+++ b/tests/no-outdir-option.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,19 +14,16 @@
 # 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 ensure that --output-dir works.  Bug report from Joshua
-# Cowan.
+# Check that the `-o' aka `--output-dir' option is not recognized anymore.
 
 . ./defs || Exit 1
 
-cat > Makefile.am <<'END'
-pkgdata_DATA =
-END
+set -e
 
-mkdir zardir
+AUTOMAKE_fails -Wno-error --output-dir=foo
+$EGREP '(invalid|unrecognized) option.*--output-dir' stderr
 
-$ACLOCAL || Exit 1
-$AUTOMAKE -Wno-obsolete --output-dir=zardir || Exit 1
+AUTOMAKE_fails -Wno-error -o foo
+$EGREP '(invalid|unrecognized) option.*-o' stderr
 
-test -f Makefile.in && Exit 1
-test -f zardir/Makefile.in
+:
-- 
1.7.1