diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/chgrp/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/chmod/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/chown/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/cp/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/du/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/expr/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/factor/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/general/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/install/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/ln/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/ls/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/mkdir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/mv/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/readlink/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/rm/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/rmdir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/seq/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/stty/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/tee/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/touch/Makefile.am | 5 |
22 files changed, 23 insertions, 49 deletions
@@ -1,5 +1,22 @@ 2007-02-24 Jim Meyering <jim@meyering.net> + Remove the "gnits" option; it prohibits my using "+" as a version + string suffix, and all it does (beyond the default "gnu" option) + is to _require_ the THANKS file. + * configure.ac (AM_INIT_AUTOMAKE): Remove it. + + Remove all AUTOMAKE_OPTIONS settings in Makefile.am files. + * tests/chgrp/Makefile.am, tests/chmod/Makefile.am: + * tests/chown/Makefile.am, tests/cp/Makefile.am: + * tests/du/Makefile.am, tests/expr/Makefile.am: + * tests/factor/Makefile.am, tests/general/Makefile.am: + * tests/install/Makefile.am, tests/ln/Makefile.am: + * tests/ls/Makefile.am, tests/mkdir/Makefile.am: + * tests/mv/Makefile.am, tests/readlink/Makefile.am: + * tests/rm/Makefile.am, tests/rmdir/Makefile.am: + * tests/seq/Makefile.am, tests/stty/Makefile.am: + * tests/tee/Makefile.am, tests/touch/Makefile.am: + * README: Document the OSF/1 4.0d build failure and work-around. Reported by Bruno Haible. diff --git a/configure.ac b/configure.ac index a1e09333f..393d7bb7e 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) AB_INIT() -AM_INIT_AUTOMAKE([1.10 gnits dist-bzip2]) +AM_INIT_AUTOMAKE([1.10 dist-bzip2]) AC_PROG_CC_STDC AM_PROG_CC_C_O diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am index 6ffa9b753..8dffd0157 100644 --- a/tests/chgrp/Makefile.am +++ b/tests/chgrp/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = \ default-no-deref \ basic \ diff --git a/tests/chmod/Makefile.am b/tests/chmod/Makefile.am index 0eac48639..1388961a6 100644 --- a/tests/chmod/Makefile.am +++ b/tests/chmod/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = \ inaccessible \ c-option \ diff --git a/tests/chown/Makefile.am b/tests/chown/Makefile.am index e452a0110..61e65818f 100644 --- a/tests/chown/Makefile.am +++ b/tests/chown/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = \ preserve-root \ basic \ diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am index 8c978ee42..f9925dbc4 100644 --- a/tests/cp/Makefile.am +++ b/tests/cp/Makefile.am @@ -17,8 +17,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.1 gnits - TESTS = \ file-perm-race parent-perm-race \ backup-dir \ diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am index 152745016..3149cfac6 100644 --- a/tests/du/Makefile.am +++ b/tests/du/Makefile.am @@ -1,7 +1,6 @@ # Make coreutils tests for "du". -*-Makefile-*- -# Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 2000, 2002-2007 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 @@ -18,8 +17,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = \ one-file-system \ inacc-dest \ diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am index e63e4a129..7440c74dc 100644 --- a/tests/expr/Makefile.am +++ b/tests/expr/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.3b gnits - TESTS = basic EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am index a77612944..dedc143bb 100644 --- a/tests/factor/Makefile.am +++ b/tests/factor/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.3b gnits - TESTS = basic EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am index aba767aa8..1dbc1d1f6 100644 --- a/tests/general/Makefile.am +++ b/tests/general/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to create Makefile.in. ## Makefile for Autoconf testsuite. -## Copyright (C) 2000, 2003 Free Software Foundation, Inc. +## Copyright (C) 2000, 2003, 2007 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 @@ -18,8 +18,6 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. -AUTOMAKE_OPTIONS = gnits - SUITE = suite.at dd.at m4sh.at EXTRA_DIST = $(SUITE) testsuite diff --git a/tests/install/Makefile.am b/tests/install/Makefile.am index 4e262ee9e..5544d7d50 100644 --- a/tests/install/Makefile.am +++ b/tests/install/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.3 gnits - TESTS = trap basic-1 create-leading d-slashdot EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/ln/Makefile.am b/tests/ln/Makefile.am index 0f970783c..7ae15a75b 100644 --- a/tests/ln/Makefile.am +++ b/tests/ln/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.2 gnits - TESTS = hard-backup target-1 sf-1 misc backup-1 EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am index 36d7b4f2c..461ba0756 100644 --- a/tests/ls/Makefile.am +++ b/tests/ls/Makefile.am @@ -1,7 +1,6 @@ # Make coreutils tests for "ls". -*-Makefile-*- -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free -# Software Foundation, Inc. +# Copyright (C) 1997-2003, 2006-2007 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 @@ -18,8 +17,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.2 gnits - TESTS = \ nameless-uid \ color-dtype-dir \ diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am index ab217af47..fc2ab777d 100644 --- a/tests/mkdir/Makefile.am +++ b/tests/mkdir/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.1 gnits - TESTS = \ p-thru-slink \ p-3 p-1 p-2 p-v special-1 perm parents t-slash p-slashdot diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am index dcc6d227f..71c911994 100644 --- a/tests/mv/Makefile.am +++ b/tests/mv/Makefile.am @@ -1,6 +1,6 @@ # Make coreutils tests for "mv". -*-Makefile-*- -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -18,8 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.3 gnits - TESTS = \ hard-verbose \ backup-dir \ diff --git a/tests/readlink/Makefile.am b/tests/readlink/Makefile.am index c6a5945cb..4ff7ef37a 100644 --- a/tests/readlink/Makefile.am +++ b/tests/readlink/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = rl-1 can-e can-f can-m EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am index 4c212b9d6..e94648945 100644 --- a/tests/rm/Makefile.am +++ b/tests/rm/Makefile.am @@ -18,8 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.1 gnits - TESTS = \ i-never \ fail-eacces \ diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am index e1c96437e..eadbaba33 100644 --- a/tests/rmdir/Makefile.am +++ b/tests/rmdir/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = fail-perm ignore t-slash EXTRA_DIST = $(TESTS) diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am index 3af0268b9..7463a5d3a 100644 --- a/tests/seq/Makefile.am +++ b/tests/seq/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.3b gnits - TESTS = basic EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/stty/Makefile.am b/tests/stty/Makefile.am index 003b7eb13..5cd33b5f2 100644 --- a/tests/stty/Makefile.am +++ b/tests/stty/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.2f gnits - TESTS = row-col-1 basic-1 EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/tee/Makefile.am b/tests/tee/Makefile.am index c4b8b2993..48f3239af 100644 --- a/tests/tee/Makefile.am +++ b/tests/tee/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -AUTOMAKE_OPTIONS = 1.4 gnits - TESTS = basic dash EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ diff --git a/tests/touch/Makefile.am b/tests/touch/Makefile.am index aabdb0900..1fce9cd67 100644 --- a/tests/touch/Makefile.am +++ b/tests/touch/Makefile.am @@ -1,7 +1,6 @@ # Make coreutils tests for "touch". -*-Makefile-*- -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1998-2007 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 @@ -18,8 +17,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AUTOMAKE_OPTIONS = 1.3 gnits - TESTS = \ read-only \ relative \ |