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.
* NEWS: Updated.
+2010-11-20 Stefano Lattarini <stefano.lattarini@gmail.com>
+
+ 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.
+ * NEWS: Updated.
+
2010-11-19 Stefano Lattarini <stefano.lattarini@gmail.com>
Automake::Config: remove extra trailing semicolon.
* Changes to automake:
- automake now generates silenced rules for texinfo outputs.
+ - The deprecated option `--output-dir' has been removed.
* New targets:
# 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 = ();
$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; },
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] =~ /^-./)
mmode.test \
mmodely.test \
multlib.test \
+no-outdir-option.test \
nobase.test \
nobase-libtool.test \
nobase-python.test \
obsolete.test \
oldvars.test \
order.test \
-outdir.test \
output.test \
output2.test \
output3.test \
mmode.test \
mmodely.test \
multlib.test \
+no-outdir-option.test \
nobase.test \
nobase-libtool.test \
nobase-python.test \
obsolete.test \
oldvars.test \
order.test \
-outdir.test \
output.test \
output2.test \
output3.test \
#! /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
# 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
+: