cosmetics: be more consistent in copyright notices in tests

* tests/cond39.test: Update the heading copyright notice, to be
consistent with the formulation used in the other files.
* tests/cond40.test: Likewise.
* tests/cond41.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/conflnk4.test: Likewise.
* tests/extra8.test: Likewise.
* tests/extra9.test: Likewise.
* tests/suffix13.test: Likewise.
* tests/vala.test: Likewise.
* tests/vala1.test: Likewise.
* tests/vala2.test: Likewise.
* tests/vala3.test: Likewise.
* tests/vala4.test: Likewise.
* tests/vala5.test: Likewise.
* lib/Automake/tests/Condition.pl: Likewise.
* lib/Automake/tests/Condition-t.pl: Likewise.
* lib/Automake/tests/DisjConditions.pl: Likewise.
* lib/Automake/tests/DisjConditions-t.pl: Likewise.
* lib/Automake/tests/Version.pl: Likewise.
* lib/Automake/tests/Wrap.pl: Likewise.
* lib/Automake/tests/Cond2.pl: Add copyright notice.
* lib/Automake/tests/Cond3.pl: Likewise.
* lib/Automake/tests/DisjCon2.pl: Likewise.
* lib/Automake/tests/DisjCon3.pl: Likewise.
* lib/Automake/tests/Version2.pl: Likewise.
* lib/Automake/tests/Version3.pl: Likewise.

28 files changed, 195 insertions, 140 deletions

diff --git a/ChangeLog b/ChangeLog
index d7ff68baa..ed93bac84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
 2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	cosmetics: be more consistent in copyright notices in tests
+	* tests/cond39.test: Update the heading copyright notice, to be
+	consistent with the formulation used in the other files.
+	* tests/cond40.test: Likewise.
+	* tests/cond41.test: Likewise.
+	* tests/cond42.test: Likewise.
+	* tests/cond43.test: Likewise.
+	* tests/conflnk4.test: Likewise.
+	* tests/extra8.test: Likewise.
+	* tests/extra9.test: Likewise.
+	* tests/suffix13.test: Likewise.
+	* tests/vala.test: Likewise.
+	* tests/vala1.test: Likewise.
+	* tests/vala2.test: Likewise.
+	* tests/vala3.test: Likewise.
+	* tests/vala4.test: Likewise.
+	* tests/vala5.test: Likewise.
+	* lib/Automake/tests/Condition.pl: Likewise.
+	* lib/Automake/tests/Condition-t.pl: Likewise.
+	* lib/Automake/tests/DisjConditions.pl: Likewise.
+	* lib/Automake/tests/DisjConditions-t.pl: Likewise.
+	* lib/Automake/tests/Version.pl: Likewise.
+	* lib/Automake/tests/Wrap.pl: Likewise.
+	* lib/Automake/tests/Cond2.pl: Add copyright notice.
+	* lib/Automake/tests/Cond3.pl: Likewise.
+	* lib/Automake/tests/DisjCon2.pl: Likewise.
+	* lib/Automake/tests/DisjCon3.pl: Likewise.
+	* lib/Automake/tests/Version2.pl: Likewise.
+	* lib/Automake/tests/Version3.pl: Likewise.
+
+2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
 	tap/awk: "Bail out!" recognized also after leading whitespace
 	Newer versions of TAP::Harness (e.g., 3.23 on Perl 5.14.1)
 	recognize a "Bail out!" directive also when it is prepended by
diff --git a/lib/Automake/tests/Cond2.pl b/lib/Automake/tests/Cond2.pl
index 4ad0e1c4d..94caa8976 100644
--- a/lib/Automake/tests/Cond2.pl
+++ b/lib/Automake/tests/Cond2.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Catch common programming error:
 # A Condition passed as a string to 'new'.
+
 use Automake::Condition;
 
 my $cond = new Automake::Condition ('TRUE');
diff --git a/lib/Automake/tests/Cond3.pl b/lib/Automake/tests/Cond3.pl
index dc957af28..e010e4f0b 100644
--- a/lib/Automake/tests/Cond3.pl
+++ b/lib/Automake/tests/Cond3.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Catch common programming error:
 # A Condition passed as a string to 'new'.
+
 use Automake::Condition;
 
 my $cond = new Automake::Condition ("COND1_TRUE");
diff --git a/lib/Automake/tests/Condition-t.pl b/lib/Automake/tests/Condition-t.pl
index 99004acf2..752d340c2 100644
--- a/lib/Automake/tests/Condition-t.pl
+++ b/lib/Automake/tests/Condition-t.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index e330e5330..1c6548412 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -1,13 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/lib/Automake/tests/DisjCon2.pl b/lib/Automake/tests/DisjCon2.pl
index 9edd8d589..37d886a73 100644
--- a/lib/Automake/tests/DisjCon2.pl
+++ b/lib/Automake/tests/DisjCon2.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Catch common programming error:
 # A non-Condition reference passed to new.
+
 use Automake::Condition;
 use Automake::DisjConditions;
 
diff --git a/lib/Automake/tests/DisjCon3.pl b/lib/Automake/tests/DisjCon3.pl
index 8e69e2b1b..c0e840dd1 100644
--- a/lib/Automake/tests/DisjCon3.pl
+++ b/lib/Automake/tests/DisjCon3.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Catch common programming error:
 # A non-reference passed to new.
+
 use Automake::Condition qw/TRUE FALSE/;
 use Automake::DisjConditions;
 
diff --git a/lib/Automake/tests/DisjConditions-t.pl b/lib/Automake/tests/DisjConditions-t.pl
index 4df511237..4acaed85c 100644
--- a/lib/Automake/tests/DisjConditions-t.pl
+++ b/lib/Automake/tests/DisjConditions-t.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/lib/Automake/tests/DisjConditions.pl b/lib/Automake/tests/DisjConditions.pl
index 7ccac13f0..b60907b34 100644
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/lib/Automake/tests/Version.pl b/lib/Automake/tests/Version.pl
index bea91f0f0..eec0c8ed5 100644
--- a/lib/Automake/tests/Version.pl
+++ b/lib/Automake/tests/Version.pl
@@ -1,13 +1,11 @@
-# Copyright (C) 2002, 2003, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2009, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/lib/Automake/tests/Version2.pl b/lib/Automake/tests/Version2.pl
index 038466deb..c1981a09a 100644
--- a/lib/Automake/tests/Version2.pl
+++ b/lib/Automake/tests/Version2.pl
@@ -1,3 +1,18 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # prog_error due to invalid $VERSION.
 
 use Automake::Version;
diff --git a/lib/Automake/tests/Version3.pl b/lib/Automake/tests/Version3.pl
index ebac23f91..7c45dc948 100644
--- a/lib/Automake/tests/Version3.pl
+++ b/lib/Automake/tests/Version3.pl
@@ -1,3 +1,18 @@
+# Copyright (C) 2011 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # prog_error due to invalid $REQUIRED.
 
 use Automake::Version;
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index b41540150..79b8d3286 100644
--- a/lib/Automake/tests/Wrap.pl
+++ b/lib/Automake/tests/Wrap.pl
@@ -1,13 +1,11 @@
-# Copyright (C) 2003, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2009, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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.
diff --git a/tests/cond39.test b/tests/cond39.test
index f6a916e01..ac64be364 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Build either as CONFIG_FILE or as PROGRAM.
 
diff --git a/tests/cond40.test b/tests/cond40.test
index e0ffbd2bf..1b62bfc2b 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -1,22 +1,18 @@
 #! /bin/sh
 # Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test AM_COND_IF.
 
diff --git a/tests/cond41.test b/tests/cond41.test
index c3778c1a1..b91500f3c 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # AM_COND_IF with an undefined condition should fail.
 
diff --git a/tests/cond42.test b/tests/cond42.test
index 9ae88cc12..2f603e860 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure an error with inconsistent state of conditionals in configure.ac.
 # This shouldn't happen with user input, as _AM_COND_* are not documented,
diff --git a/tests/cond43.test b/tests/cond43.test
index d112bd77d..aafb46bfe 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
 
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index 7597087d3..eb226ada6 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -1,22 +1,18 @@
 #! /bin/sh
 # Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
 # removed with `make distclean' only if doing a VPATH build.
diff --git a/tests/extra8.test b/tests/extra8.test
index 9d729ebca..57bbe56b3 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
 # and that referring to the same program with inconsistent addition
diff --git a/tests/extra9.test b/tests/extra9.test
index 7a9cdaa25..ac1e0a8ba 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -1,22 +1,18 @@
 #!/bin/sh
 # Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we warn about substitutions in bin_PROGRAMS if EXTRA_PROGRAMS
 # are missing; but only if the former is not AC_SUBSTed itself
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 756d83e12..3eaf8d2ee 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -2,22 +2,18 @@
 # Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Tests that Automake understands suffix rules with renamed objects
 # and subdir objects.
diff --git a/tests/vala.test b/tests/vala.test
index 6954dbd4e..959990aa7 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -2,22 +2,18 @@
 # Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure intermediate .c files are built from vala source.
 
diff --git a/tests/vala1.test b/tests/vala1.test
index 7eb8d71d3..ab72025e2 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -2,22 +2,18 @@
 # Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure intermediate .c files are built from vala sources
 # in non-recursive automake mode.
diff --git a/tests/vala2.test b/tests/vala2.test
index 55e9b8eaa..85534d9ae 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -2,22 +2,18 @@
 # Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure compiling Vala code really works with recursive make.
 
diff --git a/tests/vala3.test b/tests/vala3.test
index 8de96d667..338ca6008 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -2,22 +2,18 @@
 # Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure compiling Vala code really works with non-recursive make.
 
diff --git a/tests/vala4.test b/tests/vala4.test
index a7e6a7114..6924c041b 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -1,22 +1,18 @@
 #! /bin/sh
 # Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test AM_PROG_VALAC.
 
diff --git a/tests/vala5.test b/tests/vala5.test
index 66cffe70a..f3062e76a 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -2,22 +2,18 @@
 # Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
 # Foundation, Inc.
 #
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# 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
 # 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,
+# This program 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 Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test per-target flags.