>From 4c38a8cee729ac47aa751364978f8315e1dff1fc Mon Sep 17 00:00:00 2001
Message-Id:
From: Stefano Lattarini
Date: Tue, 27 Dec 2011 13:31:15 +0100
Subject: [PATCH] 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.
---
ChangeLog | 32 ++++++++++++++++++++++++++++++++
lib/Automake/tests/Cond2.pl | 16 ++++++++++++++++
lib/Automake/tests/Cond3.pl | 16 ++++++++++++++++
lib/Automake/tests/Condition-t.pl | 10 ++++------
lib/Automake/tests/Condition.pl | 9 ++++-----
lib/Automake/tests/DisjCon2.pl | 16 ++++++++++++++++
lib/Automake/tests/DisjCon3.pl | 16 ++++++++++++++++
lib/Automake/tests/DisjConditions-t.pl | 10 ++++------
lib/Automake/tests/DisjConditions.pl | 10 ++++------
lib/Automake/tests/Version.pl | 8 +++-----
lib/Automake/tests/Version2.pl | 15 +++++++++++++++
lib/Automake/tests/Version3.pl | 15 +++++++++++++++
lib/Automake/tests/Wrap.pl | 8 +++-----
tests/cond39.test | 10 +++-------
tests/cond40.test | 10 +++-------
tests/cond41.test | 10 +++-------
tests/cond42.test | 10 +++-------
tests/cond43.test | 10 +++-------
tests/conflnk4.test | 10 +++-------
tests/extra8.test | 10 +++-------
tests/extra9.test | 14 +++++---------
tests/suffix13.test | 10 +++-------
tests/vala.test | 10 +++-------
tests/vala1.test | 10 +++-------
tests/vala2.test | 10 +++-------
tests/vala3.test | 10 +++-------
tests/vala4.test | 10 +++-------
tests/vala5.test | 10 +++-------
28 files changed, 195 insertions(+), 140 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d7ff68b..ed93bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
2011-12-27 Stefano Lattarini
+ 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
+
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 4ad0e1c..94caa89 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 .
+
# 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 dc957af..e010e4f 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 .
+
# 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 99004ac..752d340 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 e330e53..1c65484 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 9edd8d5..37d886a 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 .
+
# 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 8e69e2b..c0e840d 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 .
+
# 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 4df5112..4acaed8 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 7ccac13..b60907b 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 bea91f0..eec0c8e 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 038466d..c1981a0 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 .
+
# prog_error due to invalid $VERSION.
use Automake::Version;
diff --git a/lib/Automake/tests/Version3.pl b/lib/Automake/tests/Version3.pl
index ebac23f..7c45dc9 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 .
+
# prog_error due to invalid $REQUIRED.
use Automake::Version;
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index b415401..79b8d32 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 f6a916e..ac64be3 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 .
# Build either as CONFIG_FILE or as PROGRAM.
diff --git a/tests/cond40.test b/tests/cond40.test
index e0ffbd2..1b62bfc 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 .
# Test AM_COND_IF.
diff --git a/tests/cond41.test b/tests/cond41.test
index c3778c1..b91500f 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 .
# AM_COND_IF with an undefined condition should fail.
diff --git a/tests/cond42.test b/tests/cond42.test
index 9ae88cc..2f603e8 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 .
# 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 d112bd7..aafb46b 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 .
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index 7597087..eb226ad 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 .
# 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 9d729eb..57bbe56 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 .
# 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 7a9cdaa..ac1e0a8 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 .
# 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 756d83e..3eaf8d2 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 .
# Tests that Automake understands suffix rules with renamed objects
# and subdir objects.
diff --git a/tests/vala.test b/tests/vala.test
index 6954dbd..959990a 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 .
# Test to make sure intermediate .c files are built from vala source.
diff --git a/tests/vala1.test b/tests/vala1.test
index 7eb8d71..ab72025 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 .
# 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 55e9b8e..85534d9 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 .
# Test to make sure compiling Vala code really works with recursive make.
diff --git a/tests/vala3.test b/tests/vala3.test
index 8de96d6..338ca60 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 .
# Test to make sure compiling Vala code really works with non-recursive make.
diff --git a/tests/vala4.test b/tests/vala4.test
index a7e6a71..6924c04 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 .
# Test AM_PROG_VALAC.
diff --git a/tests/vala5.test b/tests/vala5.test
index 66cffe7..f3062e7 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 .
# Test per-target flags.
--
1.7.7.3