summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.00 (renamed from ChangeLog.2000)0
-rw-r--r--ChangeLog.01 (renamed from ChangeLog.2001)0
-rw-r--r--ChangeLog.96 (renamed from ChangeLog.1996)0
-rw-r--r--ChangeLog.98 (renamed from ChangeLog.1998)0
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in10
-rw-r--r--tests/Makefile.am102
-rw-r--r--tests/Makefile.in102
-rwxr-xr-xtests/aclocal2.test36
-rwxr-xr-xtests/aclocal3.test (renamed from tests/aclocalii.test)0
-rwxr-xr-xtests/aclocali.test43
-rwxr-xr-xtests/aclocali1.test41
-rwxr-xr-xtests/acoutbs.test (renamed from tests/acouttbs.test)0
-rwxr-xr-xtests/acoutbs2.test (renamed from tests/acouttbs2.test)0
-rwxr-xr-xtests/acoutpt.test (renamed from tests/acoutput.test)0
-rwxr-xr-xtests/acoutpt2.test (renamed from tests/acoutput2.test)0
-rwxr-xr-xtests/autohdr.test (renamed from tests/autoheader.test)0
-rwxr-xr-xtests/autohdr2.test (renamed from tests/autoheader2.test)0
-rwxr-xr-xtests/condinc.test (renamed from tests/condincl.test)0
-rwxr-xr-xtests/condinc2.test (renamed from tests/condincl2.test)0
-rwxr-xr-xtests/distcom.test (renamed from tests/distcommon.test)0
-rwxr-xr-xtests/distcom2.test (renamed from tests/distcommon2.test)0
-rwxr-xr-xtests/distcom3.test (renamed from tests/distcommon3.test)0
-rwxr-xr-xtests/instdat.test (renamed from tests/instdata.test)0
-rwxr-xr-xtests/instdat2.test (renamed from tests/instdata2.test)0
-rwxr-xr-xtests/instsh.test (renamed from tests/installsh.test)0
-rwxr-xr-xtests/instsh2.test (renamed from tests/installsh2.test)0
-rwxr-xr-xtests/libobj12.test4
-rwxr-xr-xtests/libobj13.test (renamed from tests/libobj12b.test)0
-rwxr-xr-xtests/link_fc.test (renamed from tests/link_f_c.test)0
-rwxr-xr-xtests/link_fccxx.test (renamed from tests/link_f_c_cxx.test)0
-rwxr-xr-xtests/link_fcxx.test (renamed from tests/link_f_cxx.test)0
-rwxr-xr-xtests/nodef.test (renamed from tests/nodefine.test)4
-rwxr-xr-xtests/nodef2.test (renamed from tests/nodefine2.test)0
-rwxr-xr-xtests/reqd.test (renamed from tests/required.test)0
-rwxr-xr-xtests/reqd2.test (renamed from tests/required2.test)0
-rwxr-xr-xtests/specflg.test (renamed from tests/specflags.test)0
-rwxr-xr-xtests/specflg2.test (renamed from tests/specflags2.test)0
-rwxr-xr-xtests/specflg3.test (renamed from tests/specflags3.test)0
-rwxr-xr-xtests/specflg6.test (renamed from tests/specflags6.test)0
-rwxr-xr-xtests/specflg7.test (renamed from tests/specflags7.test)0
-rwxr-xr-xtests/specflg8.test (renamed from tests/specflags8.test)0
-rwxr-xr-xtests/specflg9.test (renamed from tests/specflags9.test)0
-rwxr-xr-xtests/srcsub.test (renamed from tests/sourcesub.test)0
-rwxr-xr-xtests/srcsub2.test (renamed from tests/sourcesub2.test)0
-rwxr-xr-xtests/subcond.test (renamed from tests/subdircond.test)0
-rwxr-xr-xtests/subcond2.test (renamed from tests/subdircond2.test)4
-rwxr-xr-xtests/subcond3.test (renamed from tests/subdircond3.test)4
-rwxr-xr-xtests/txinfo.test (renamed from tests/texinfo.test)0
-rwxr-xr-xtests/txinfo10.test (renamed from tests/texinfo10.test)0
-rwxr-xr-xtests/txinfo13.test (renamed from tests/texinfo13.test)0
-rwxr-xr-xtests/txinfo16.test (renamed from tests/texinfo16.test)0
-rwxr-xr-xtests/txinfo17.test (renamed from tests/texinfo17.test)0
-rwxr-xr-xtests/txinfo18.test (renamed from tests/texinfo18.test)0
-rwxr-xr-xtests/txinfo2.test (renamed from tests/texinfo2.test)0
-rwxr-xr-xtests/txinfo3.test (renamed from tests/texinfo3.test)0
-rwxr-xr-xtests/txinfo4.test (renamed from tests/texinfo4.test)0
-rwxr-xr-xtests/txinfo5.test (renamed from tests/texinfo5.test)0
-rwxr-xr-xtests/txinfo6.test (renamed from tests/texinfo6.test)0
-rwxr-xr-xtests/txinfo7.test (renamed from tests/texinfo7.test)0
-rwxr-xr-xtests/txinfo8.test (renamed from tests/texinfo8.test)0
-rwxr-xr-xtests/txinfo9.test (renamed from tests/texinfo9.test)0
62 files changed, 132 insertions, 220 deletions
diff --git a/ChangeLog.2000 b/ChangeLog.00
index 01111ef8c..01111ef8c 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.00
diff --git a/ChangeLog.2001 b/ChangeLog.01
index e0dc01e3c..e0dc01e3c 100644
--- a/ChangeLog.2001
+++ b/ChangeLog.01
diff --git a/ChangeLog.1996 b/ChangeLog.96
index c8de8c174..c8de8c174 100644
--- a/ChangeLog.1996
+++ b/ChangeLog.96
diff --git a/ChangeLog.1998 b/ChangeLog.98
index 918c21726..918c21726 100644
--- a/ChangeLog.1998
+++ b/ChangeLog.98
diff --git a/Makefile.am b/Makefile.am
index a0925b194..e0f5c263d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ ETAGS_ARGS = --lang=none \
--regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
TAGS_DEPENDENCIES = automake.texi
-EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 ChangeLog.2001 \
+EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
$(AUTOMAKESOURCES)
## Make versioned links. We only run the transform on the root name;
diff --git a/Makefile.in b/Makefile.in
index 3e4736e1b..177d8ccdf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,7 +109,7 @@ ETAGS_ARGS = --lang=none \
TAGS_DEPENDENCIES = automake.texi
-EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 ChangeLog.2001 \
+EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
$(AUTOMAKESOURCES)
@@ -487,12 +487,12 @@ distcheck: dist
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/=build \
+ && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 065d1c370..e445ecefd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,14 +7,14 @@ acinclude.test \
aclibobj.test \
aclocal.test \
aclocal2.test \
-aclocali.test \
-aclocali1.test \
-aclocalii.test \
+aclocal.test \
+aclocal2.test \
+aclocal3.test \
acoutnoq.test \
-acoutput.test \
-acoutput2.test \
+acoutpt.test \
+acoutpt2.test \
acoutqnl.test \
-acouttbs.test \
+acoutbs.test \
acsilent.test \
acsubst.test \
acsubst2.test \
@@ -34,8 +34,8 @@ ansi9.test \
ansi10.test \
ar.test \
asm.test \
-autoheader.test \
-autoheader2.test \
+autohdr.test \
+autohdr2.test \
auxdir.test \
auxdir2.test \
backsl.test \
@@ -99,8 +99,8 @@ cond26.test \
cond27.test \
cond28.test \
condd.test \
-condincl.test \
-condincl2.test \
+condinc.test \
+condinc2.test \
condlib.test \
condman.test \
condman2.test \
@@ -142,9 +142,9 @@ destdir.test \
dirforbid.test \
dirlist.test \
discover.test \
-distcommon.test \
-distcommon2.test \
-distcommon3.test \
+distcom.test \
+distcom2.test \
+distcom3.test \
distdir.test \
distname.test \
dollar.test \
@@ -199,10 +199,10 @@ insh.test \
insh2.test \
install2.test \
installdir.test \
-installsh.test \
-installsh2.test \
-instdata.test \
-instdata2.test \
+instsh.test \
+instsh2.test \
+instdat.test \
+instdat2.test \
instexec.test \
insthook.test \
instman.test \
@@ -229,7 +229,7 @@ libobj8.test \
libobj10.test \
libobj11.test \
libobj12.test \
-libobj12b.test \
+libobj13.test \
library.test \
library2.test \
library3.test \
@@ -241,9 +241,9 @@ libtool5.test \
libtool6.test \
link_c_cxx.test \
link_dist.test \
-link_f_c.test \
-link_f_c_cxx.test \
-link_f_cxx.test \
+link_fc.test \
+link_fccxx.test \
+link_fcxx.test \
link_f_only.test \
lisp.test \
lisp2.test \
@@ -265,8 +265,8 @@ mdate4.test \
mkinst2.test \
mkinstall.test \
nobase.test \
-nodefine.test \
-nodefine2.test \
+nodef.test \
+nodef2.test \
nodep.test \
nodepcomp.test \
nodist.test \
@@ -333,22 +333,22 @@ remake.test \
remake2.test \
remake3.test \
req.test \
-required.test \
-required2.test \
+reqd.test \
+reqd2.test \
rulepat.test \
scripts.test \
seenc.test \
sinclude.test \
-sourcesub.test \
-sourcesub2.test \
+srcsub.test \
+srcsub2.test \
space.test \
-specflags.test \
-specflags2.test \
-specflags3.test \
-specflags6.test \
-specflags7.test \
-specflags8.test \
-specflags9.test \
+specflg.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
spell.test \
spell2.test \
spell3.test \
@@ -365,9 +365,9 @@ subdir5.test \
subdir6.test \
subdir7.test \
subdirbuiltsources.test \
-subdircond.test \
-subdircond2.test \
-subdircond3.test \
+subcond.test \
+subcond2.test \
+subcond3.test \
subobj.test \
subobj2.test \
subobj3.test \
@@ -402,20 +402,20 @@ tagsub.test \
target.test \
target-cflags.test \
targetclash.test \
-texinfo.test \
-texinfo2.test \
-texinfo3.test \
-texinfo4.test \
-texinfo5.test \
-texinfo6.test \
-texinfo7.test \
-texinfo8.test \
-texinfo9.test \
-texinfo10.test \
-texinfo13.test \
-texinfo16.test \
-texinfo17.test \
-texinfo18.test \
+txinfo.test \
+txinfo2.test \
+txinfo3.test \
+txinfo4.test \
+txinfo5.test \
+txinfo6.test \
+txinfo7.test \
+txinfo8.test \
+txinfo9.test \
+txinfo10.test \
+txinfo13.test \
+txinfo16.test \
+txinfo17.test \
+txinfo18.test \
transform.test \
unused.test \
vars.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 15620a67f..c69f6e072 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -100,14 +100,14 @@ acinclude.test \
aclibobj.test \
aclocal.test \
aclocal2.test \
-aclocali.test \
-aclocali1.test \
-aclocalii.test \
+aclocal.test \
+aclocal2.test \
+aclocal3.test \
acoutnoq.test \
-acoutput.test \
-acoutput2.test \
+acoutpt.test \
+acoutpt2.test \
acoutqnl.test \
-acouttbs.test \
+acoutbs.test \
acsilent.test \
acsubst.test \
acsubst2.test \
@@ -127,8 +127,8 @@ ansi9.test \
ansi10.test \
ar.test \
asm.test \
-autoheader.test \
-autoheader2.test \
+autohdr.test \
+autohdr2.test \
auxdir.test \
auxdir2.test \
backsl.test \
@@ -192,8 +192,8 @@ cond26.test \
cond27.test \
cond28.test \
condd.test \
-condincl.test \
-condincl2.test \
+condinc.test \
+condinc2.test \
condlib.test \
condman.test \
condman2.test \
@@ -235,9 +235,9 @@ destdir.test \
dirforbid.test \
dirlist.test \
discover.test \
-distcommon.test \
-distcommon2.test \
-distcommon3.test \
+distcom.test \
+distcom2.test \
+distcom3.test \
distdir.test \
distname.test \
dollar.test \
@@ -292,10 +292,10 @@ insh.test \
insh2.test \
install2.test \
installdir.test \
-installsh.test \
-installsh2.test \
-instdata.test \
-instdata2.test \
+instsh.test \
+instsh2.test \
+instdat.test \
+instdat2.test \
instexec.test \
insthook.test \
instman.test \
@@ -322,7 +322,7 @@ libobj8.test \
libobj10.test \
libobj11.test \
libobj12.test \
-libobj12b.test \
+libobj13.test \
library.test \
library2.test \
library3.test \
@@ -334,9 +334,9 @@ libtool5.test \
libtool6.test \
link_c_cxx.test \
link_dist.test \
-link_f_c.test \
-link_f_c_cxx.test \
-link_f_cxx.test \
+link_fc.test \
+link_fccxx.test \
+link_fcxx.test \
link_f_only.test \
lisp.test \
lisp2.test \
@@ -358,8 +358,8 @@ mdate4.test \
mkinst2.test \
mkinstall.test \
nobase.test \
-nodefine.test \
-nodefine2.test \
+nodef.test \
+nodef2.test \
nodep.test \
nodepcomp.test \
nodist.test \
@@ -426,22 +426,22 @@ remake.test \
remake2.test \
remake3.test \
req.test \
-required.test \
-required2.test \
+reqd.test \
+reqd2.test \
rulepat.test \
scripts.test \
seenc.test \
sinclude.test \
-sourcesub.test \
-sourcesub2.test \
+srcsub.test \
+srcsub2.test \
space.test \
-specflags.test \
-specflags2.test \
-specflags3.test \
-specflags6.test \
-specflags7.test \
-specflags8.test \
-specflags9.test \
+specflg.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
spell.test \
spell2.test \
spell3.test \
@@ -458,9 +458,9 @@ subdir5.test \
subdir6.test \
subdir7.test \
subdirbuiltsources.test \
-subdircond.test \
-subdircond2.test \
-subdircond3.test \
+subcond.test \
+subcond2.test \
+subcond3.test \
subobj.test \
subobj2.test \
subobj3.test \
@@ -495,20 +495,20 @@ tagsub.test \
target.test \
target-cflags.test \
targetclash.test \
-texinfo.test \
-texinfo2.test \
-texinfo3.test \
-texinfo4.test \
-texinfo5.test \
-texinfo6.test \
-texinfo7.test \
-texinfo8.test \
-texinfo9.test \
-texinfo10.test \
-texinfo13.test \
-texinfo16.test \
-texinfo17.test \
-texinfo18.test \
+txinfo.test \
+txinfo2.test \
+txinfo3.test \
+txinfo4.test \
+txinfo5.test \
+txinfo6.test \
+txinfo7.test \
+txinfo8.test \
+txinfo9.test \
+txinfo10.test \
+txinfo13.test \
+txinfo16.test \
+txinfo17.test \
+txinfo18.test \
transform.test \
unused.test \
vars.test \
diff --git a/tests/aclocal2.test b/tests/aclocal2.test
index f2b38bba3..c9461acfd 100755
--- a/tests/aclocal2.test
+++ b/tests/aclocal2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -18,28 +18,24 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Make sure aclocal works with macro that have parentheses in their
-# name. Report from Tamara L. Dahlgren and Tom Epperly.
-
+# Make sure that ACLOCAL_AMFLAGS doesn't cause circular dependencies.
. ./defs || exit 1
-set -e
+echo AM_QUUX >> configure.in
+
+cat > quux.m4 << 'END'
+AC_DEFUN([AM_QUUX], [
+])
+END
-mkdir m4
-cat >m4/f90.m4 <<EOF
-AC_DEFUN([AM_LANG_PREPROC(Fortran 90)], [...something...])
-EOF
+cat > Makefile.am << 'END'
+ACLOCAL_AMFLAGS = -I .
+END
-cat >acinclude.m4 <<EOF
-AC_DEFUN([AM_FUBAR],
-[AC_REQUIRE([AM_LANG_PREPROC(Fortran 90)])])
-EOF
+# We have to run aclocal first to make sure that aclocal.m4 exists.
+# Otherwise automake won't guess that we want to auto-generate it.
+$ACLOCAL -I . || exit 1
-cat >>configure.in <<EOF
-AM_FUBAR
-EOF
+$AUTOMAKE || exit 1
-$ACLOCAL -I m4 2>stderr
-cat stderr
-grep AM_LANG_PREPROC stderr && exit 1
-$FGREP 'AC_DEFUN([AM_LANG_PREPROC(Fortran 90)' aclocal.m4
+grep "\$(ACLOCAL_M4): *configure.in *quux.m4" Makefile.in || exit 1
diff --git a/tests/aclocalii.test b/tests/aclocal3.test
index b1d4e9825..b1d4e9825 100755
--- a/tests/aclocalii.test
+++ b/tests/aclocal3.test
diff --git a/tests/aclocali.test b/tests/aclocali.test
deleted file mode 100755
index cd5ae38cf..000000000
--- a/tests/aclocali.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2002 Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with autoconf; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Make sure that ACLOCAL_AMFLAGS actually gets the right dependencies.
-. ./defs || exit 1
-
-echo AM_QUUX >> configure.in
-
-mkdir macros
-
-cat > macros/quux.m4 << 'END'
-AC_DEFUN([AM_QUUX], [
-])
-END
-
-cat > Makefile.am << 'END'
-ACLOCAL_AMFLAGS = -I macros
-END
-
-# We have to run aclocal first to make sure that aclocal.m4 exists.
-# Otherwise automake won't guess that we want to auto-generate it.
-$ACLOCAL -I macros || exit 1
-
-$AUTOMAKE || exit 1
-
-$FGREP quux.m4 Makefile.in
diff --git a/tests/aclocali1.test b/tests/aclocali1.test
deleted file mode 100755
index c9461acfd..000000000
--- a/tests/aclocali1.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with autoconf; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Make sure that ACLOCAL_AMFLAGS doesn't cause circular dependencies.
-. ./defs || exit 1
-
-echo AM_QUUX >> configure.in
-
-cat > quux.m4 << 'END'
-AC_DEFUN([AM_QUUX], [
-])
-END
-
-cat > Makefile.am << 'END'
-ACLOCAL_AMFLAGS = -I .
-END
-
-# We have to run aclocal first to make sure that aclocal.m4 exists.
-# Otherwise automake won't guess that we want to auto-generate it.
-$ACLOCAL -I . || exit 1
-
-$AUTOMAKE || exit 1
-
-grep "\$(ACLOCAL_M4): *configure.in *quux.m4" Makefile.in || exit 1
diff --git a/tests/acouttbs.test b/tests/acoutbs.test
index fe1224f83..fe1224f83 100755
--- a/tests/acouttbs.test
+++ b/tests/acoutbs.test
diff --git a/tests/acouttbs2.test b/tests/acoutbs2.test
index 7a41237cc..7a41237cc 100755
--- a/tests/acouttbs2.test
+++ b/tests/acoutbs2.test
diff --git a/tests/acoutput.test b/tests/acoutpt.test
index e9da7df93..e9da7df93 100755
--- a/tests/acoutput.test
+++ b/tests/acoutpt.test
diff --git a/tests/acoutput2.test b/tests/acoutpt2.test
index 854df9c5e..854df9c5e 100755
--- a/tests/acoutput2.test
+++ b/tests/acoutpt2.test
diff --git a/tests/autoheader.test b/tests/autohdr.test
index 7ce915798..7ce915798 100755
--- a/tests/autoheader.test
+++ b/tests/autohdr.test
diff --git a/tests/autoheader2.test b/tests/autohdr2.test
index 15a00e2ea..15a00e2ea 100755
--- a/tests/autoheader2.test
+++ b/tests/autohdr2.test
diff --git a/tests/condincl.test b/tests/condinc.test
index 1523924d9..1523924d9 100755
--- a/tests/condincl.test
+++ b/tests/condinc.test
diff --git a/tests/condincl2.test b/tests/condinc2.test
index 0f8fbe748..0f8fbe748 100755
--- a/tests/condincl2.test
+++ b/tests/condinc2.test
diff --git a/tests/distcommon.test b/tests/distcom.test
index cc5b73139..cc5b73139 100755
--- a/tests/distcommon.test
+++ b/tests/distcom.test
diff --git a/tests/distcommon2.test b/tests/distcom2.test
index 0c318cc19..0c318cc19 100755
--- a/tests/distcommon2.test
+++ b/tests/distcom2.test
diff --git a/tests/distcommon3.test b/tests/distcom3.test
index e92ccfa36..e92ccfa36 100755
--- a/tests/distcommon3.test
+++ b/tests/distcom3.test
diff --git a/tests/instdata.test b/tests/instdat.test
index 35926231f..35926231f 100755
--- a/tests/instdata.test
+++ b/tests/instdat.test
diff --git a/tests/instdata2.test b/tests/instdat2.test
index ca0920517..ca0920517 100755
--- a/tests/instdata2.test
+++ b/tests/instdat2.test
diff --git a/tests/installsh.test b/tests/instsh.test
index b97989d76..b97989d76 100755
--- a/tests/installsh.test
+++ b/tests/instsh.test
diff --git a/tests/installsh2.test b/tests/instsh2.test
index d2eebf931..d2eebf931 100755
--- a/tests/installsh2.test
+++ b/tests/instsh2.test
diff --git a/tests/libobj12.test b/tests/libobj12.test
index a3907263d..e8237e482 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -20,7 +20,7 @@
# Test if a file can be mentioned in LIBOBJS and explicitly.
-# (See libobj12b.test for the LTLIBRARIES check.)
+# (See libobj13.test for the LTLIBRARIES check.)
. ./defs || exit 1
set -e
diff --git a/tests/libobj12b.test b/tests/libobj13.test
index 528fec9f1..528fec9f1 100755
--- a/tests/libobj12b.test
+++ b/tests/libobj13.test
diff --git a/tests/link_f_c.test b/tests/link_fc.test
index 3a8d45013..3a8d45013 100755
--- a/tests/link_f_c.test
+++ b/tests/link_fc.test
diff --git a/tests/link_f_c_cxx.test b/tests/link_fccxx.test
index 0abf84b8b..0abf84b8b 100755
--- a/tests/link_f_c_cxx.test
+++ b/tests/link_fccxx.test
diff --git a/tests/link_f_cxx.test b/tests/link_fcxx.test
index 253cf57f3..253cf57f3 100755
--- a/tests/link_f_cxx.test
+++ b/tests/link_fcxx.test
diff --git a/tests/nodefine.test b/tests/nodef.test
index 61bbd9c06..eb51e2733 100755
--- a/tests/nodefine.test
+++ b/tests/nodef.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -28,7 +28,7 @@ set -e
# Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE
# forms. The day these obsolete AC_INIT and AM_INIT_AUTOMAKE forms
# are dropped, just erase the file.
-# nodefine2.test contains the modern version of this test.
+# nodef2.test contains the modern version of this test.
# -------------------------------------------------------------------
# First, check that PACKAGE and VERSION are output by default.
diff --git a/tests/nodefine2.test b/tests/nodef2.test
index 78ada8cd6..78ada8cd6 100755
--- a/tests/nodefine2.test
+++ b/tests/nodef2.test
diff --git a/tests/required.test b/tests/reqd.test
index 6a872c9cc..6a872c9cc 100755
--- a/tests/required.test
+++ b/tests/reqd.test
diff --git a/tests/required2.test b/tests/reqd2.test
index ab17a168e..ab17a168e 100755
--- a/tests/required2.test
+++ b/tests/reqd2.test
diff --git a/tests/specflags.test b/tests/specflg.test
index 7670cdd31..7670cdd31 100755
--- a/tests/specflags.test
+++ b/tests/specflg.test
diff --git a/tests/specflags2.test b/tests/specflg2.test
index 514b95236..514b95236 100755
--- a/tests/specflags2.test
+++ b/tests/specflg2.test
diff --git a/tests/specflags3.test b/tests/specflg3.test
index a96934fe9..a96934fe9 100755
--- a/tests/specflags3.test
+++ b/tests/specflg3.test
diff --git a/tests/specflags6.test b/tests/specflg6.test
index 408e0b5e2..408e0b5e2 100755
--- a/tests/specflags6.test
+++ b/tests/specflg6.test
diff --git a/tests/specflags7.test b/tests/specflg7.test
index 34a806712..34a806712 100755
--- a/tests/specflags7.test
+++ b/tests/specflg7.test
diff --git a/tests/specflags8.test b/tests/specflg8.test
index 00fdd599d..00fdd599d 100755
--- a/tests/specflags8.test
+++ b/tests/specflg8.test
diff --git a/tests/specflags9.test b/tests/specflg9.test
index 6488481e1..6488481e1 100755
--- a/tests/specflags9.test
+++ b/tests/specflg9.test
diff --git a/tests/sourcesub.test b/tests/srcsub.test
index 8cd226bf2..8cd226bf2 100755
--- a/tests/sourcesub.test
+++ b/tests/srcsub.test
diff --git a/tests/sourcesub2.test b/tests/srcsub2.test
index 797dfb61a..797dfb61a 100755
--- a/tests/sourcesub2.test
+++ b/tests/srcsub2.test
diff --git a/tests/subdircond.test b/tests/subcond.test
index 9e5351632..9e5351632 100755
--- a/tests/subdircond.test
+++ b/tests/subcond.test
diff --git a/tests/subdircond2.test b/tests/subcond2.test
index 89303a8b6..c59deaadb 100755
--- a/tests/subdircond2.test
+++ b/tests/subcond2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -20,7 +20,7 @@
# The for conditional SUBDIRS.
# SUBDIRS + AM_CONDITIONAL setup from the manual.
-# Lots of lines here are duplicated in subdircond3.test.
+# Lots of lines here are duplicated in subcond3.test.
. ./defs || exit 1
diff --git a/tests/subdircond3.test b/tests/subcond3.test
index 1ba388462..68691c9f1 100755
--- a/tests/subdircond3.test
+++ b/tests/subcond3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -20,7 +20,7 @@
# The for conditional SUBDIRS.
# SUBDIRS + AC_SUBST setup from the manual.
-# Lots of lines here are duplicated in subdircond2.test.
+# Lots of lines here are duplicated in subcond2.test.
. ./defs || exit 1
diff --git a/tests/texinfo.test b/tests/txinfo.test
index 4d3949ed7..4d3949ed7 100755
--- a/tests/texinfo.test
+++ b/tests/txinfo.test
diff --git a/tests/texinfo10.test b/tests/txinfo10.test
index bd120c43e..bd120c43e 100755
--- a/tests/texinfo10.test
+++ b/tests/txinfo10.test
diff --git a/tests/texinfo13.test b/tests/txinfo13.test
index 077f63543..077f63543 100755
--- a/tests/texinfo13.test
+++ b/tests/txinfo13.test
diff --git a/tests/texinfo16.test b/tests/txinfo16.test
index a3fe2653e..a3fe2653e 100755
--- a/tests/texinfo16.test
+++ b/tests/txinfo16.test
diff --git a/tests/texinfo17.test b/tests/txinfo17.test
index 60ecdd32c..60ecdd32c 100755
--- a/tests/texinfo17.test
+++ b/tests/txinfo17.test
diff --git a/tests/texinfo18.test b/tests/txinfo18.test
index d88f84256..d88f84256 100755
--- a/tests/texinfo18.test
+++ b/tests/txinfo18.test
diff --git a/tests/texinfo2.test b/tests/txinfo2.test
index e1e1b4650..e1e1b4650 100755
--- a/tests/texinfo2.test
+++ b/tests/txinfo2.test
diff --git a/tests/texinfo3.test b/tests/txinfo3.test
index 9f59c516c..9f59c516c 100755
--- a/tests/texinfo3.test
+++ b/tests/txinfo3.test
diff --git a/tests/texinfo4.test b/tests/txinfo4.test
index 31af8b8bf..31af8b8bf 100755
--- a/tests/texinfo4.test
+++ b/tests/txinfo4.test
diff --git a/tests/texinfo5.test b/tests/txinfo5.test
index e75e31842..e75e31842 100755
--- a/tests/texinfo5.test
+++ b/tests/txinfo5.test
diff --git a/tests/texinfo6.test b/tests/txinfo6.test
index 556d73534..556d73534 100755
--- a/tests/texinfo6.test
+++ b/tests/txinfo6.test
diff --git a/tests/texinfo7.test b/tests/txinfo7.test
index 5f6a970ec..5f6a970ec 100755
--- a/tests/texinfo7.test
+++ b/tests/txinfo7.test
diff --git a/tests/texinfo8.test b/tests/txinfo8.test
index db9aebc55..db9aebc55 100755
--- a/tests/texinfo8.test
+++ b/tests/txinfo8.test
diff --git a/tests/texinfo9.test b/tests/txinfo9.test
index c761a4d07..c761a4d07 100755
--- a/tests/texinfo9.test
+++ b/tests/txinfo9.test