Hello automakers.
While modifying the test script `suffix13.test' recently, I noticed
that it uses an obsolete form of copyright notice:
# 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 Automake; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
I thus looked in the automake source tree for other files sharing
this wart:
$ git branch | grep '\*'
* master
$ git grep -l -E -i '#.*(part of gnu|franklin)'
lib/Automake/tests/Condition-t.pl
lib/Automake/tests/Condition.pl
lib/Automake/tests/DisjConditions-t.pl
lib/Automake/tests/DisjConditions.pl
lib/Automake/tests/Version.pl
lib/Automake/tests/Wrap.pl
lib/config-ml.in
lib/config.guess
lib/config.sub
lib/symlink-tree
tests/cond39.test
tests/cond40.test
tests/cond41.test
tests/cond42.test
tests/cond43.test
tests/conflnk4.test
tests/extra8.test
tests/extra9.test
tests/suffix13.test
tests/vala.test
tests/vala1.test
tests/vala2.test
tests/vala3.test
tests/vala4.test
tests/vala5.test
The files in `lib/' listed above are automatically fetched from external
sources, so I decided not to touch them. I fixed the remaining files
with a tiny throw-away script. The result is the attached patch.
OK for master?
Regards,
Stefano
From 4e5cd9c44c46ed6cf5edc5576602c1075f51a422 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 17 Nov 2010 00:18:15 +0100
Subject: [PATCH] Be more consistent in copyright notices.
* lib/Automake/tests/Condition.pl: Update the heading copyright
notice, to be consistent with the formulation used in the other
files.
* 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.
* tests/cond39.test: Likewise.
* 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.
---
ChangeLog | 27 +++++++++++++++++++++++++++
lib/Automake/tests/Condition-t.pl | 2 --
lib/Automake/tests/Condition.pl | 2 --
lib/Automake/tests/DisjConditions-t.pl | 2 --
lib/Automake/tests/DisjConditions.pl | 2 --
lib/Automake/tests/Version.pl | 2 --
lib/Automake/tests/Wrap.pl | 2 --
tests/cond39.test | 9 +++------
tests/cond40.test | 9 +++------
tests/cond41.test | 9 +++------
tests/cond42.test | 9 +++------
tests/cond43.test | 9 +++------
tests/conflnk4.test | 9 +++------
tests/extra8.test | 9 +++------
tests/extra9.test | 13 +++++--------
tests/suffix13.test | 9 +++------
tests/vala.test | 9 +++------
tests/vala1.test | 9 +++------
tests/vala2.test | 9 +++------
tests/vala3.test | 9 +++------
tests/vala4.test | 9 +++------
tests/vala5.test | 9 +++------
22 files changed, 74 insertions(+), 104 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 40d770e..fdbd5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2010-11-17 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ Be more consistent in copyright notices.
+ * lib/Automake/tests/Condition.pl: Update the heading copyright
+ notice, to be consistent with the formulation used in the other
+ files.
+ * 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.
+ * tests/cond39.test: Likewise.
+ * 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.
+
2010-11-16 Stefano Lattarini <stefano.lattar...@gmail.com>
Fix regression in colon{5,6}.test (failures on AIX 5.3).
diff --git a/lib/Automake/tests/Condition-t.pl b/lib/Automake/tests/Condition-t.pl
index 99004ac..1e60f4d 100644
--- a/lib/Automake/tests/Condition-t.pl
+++ b/lib/Automake/tests/Condition-t.pl
@@ -1,8 +1,6 @@
# Copyright (C) 2001, 2002, 2003, 2008, 2009 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)
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index e330e53..d352aac 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -1,7 +1,5 @@
# Copyright (C) 2001, 2002, 2003, 2009 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)
diff --git a/lib/Automake/tests/DisjConditions-t.pl b/lib/Automake/tests/DisjConditions-t.pl
index 4df5112..ff1e90f 100644
--- a/lib/Automake/tests/DisjConditions-t.pl
+++ b/lib/Automake/tests/DisjConditions-t.pl
@@ -1,8 +1,6 @@
# Copyright (C) 2001, 2002, 2003, 2008, 2009 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)
diff --git a/lib/Automake/tests/DisjConditions.pl b/lib/Automake/tests/DisjConditions.pl
index 7ccac13..a82a71a 100644
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -1,8 +1,6 @@
# Copyright (C) 2001, 2002, 2003, 2008, 2009 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)
diff --git a/lib/Automake/tests/Version.pl b/lib/Automake/tests/Version.pl
index bea91f0..20ed0a9 100644
--- a/lib/Automake/tests/Version.pl
+++ b/lib/Automake/tests/Version.pl
@@ -1,7 +1,5 @@
# Copyright (C) 2002, 2003, 2009 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)
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index b415401..1be5d33 100644
--- a/lib/Automake/tests/Wrap.pl
+++ b/lib/Automake/tests/Wrap.pl
@@ -1,7 +1,5 @@
# Copyright (C) 2003, 2009 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)
diff --git a/tests/cond39.test b/tests/cond39.test
index 8d96595..2d44e30 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2008, 2010 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Build either as CONFIG_FILE or as PROGRAM.
diff --git a/tests/cond40.test b/tests/cond40.test
index c0bde5c..054dd68 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -1,21 +1,18 @@
#! /bin/sh
# Copyright (C) 2008, 2010 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test AM_COND_IF.
diff --git a/tests/cond41.test b/tests/cond41.test
index b32bff3..14dc988 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2008 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# AM_COND_IF with an undefined condition should fail.
diff --git a/tests/cond42.test b/tests/cond42.test
index 00ca114..de4da0a 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2008 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Ensure an error with inconsistent state of conditionals in configure.ac.
diff --git a/tests/cond43.test b/tests/cond43.test
index 1b468a7..df034f6 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2008 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index fd96054..6d43e71 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -1,21 +1,18 @@
#! /bin/sh
# Copyright (C) 2003, 2008 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
diff --git a/tests/extra8.test b/tests/extra8.test
index eb9f9a1..0b9c355 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2009 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
diff --git a/tests/extra9.test b/tests/extra9.test
index fefd385..d3876e8 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -1,21 +1,18 @@
#!/bin/sh
# Copyright (C) 2009 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Ensure we warn about substitutions in bin_PROGRAMS if EXTRA_PROGRAMS
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 2b39460..4e7d350 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -2,21 +2,18 @@
# Copyright (C) 2002, 2003, 2006, 2009, 2010 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Tests that Automake understands suffix rules with renamed objects
diff --git a/tests/vala.test b/tests/vala.test
index 3e9ae36..58e2012 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -2,21 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
# 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test to make sure intermediate .c files are built from vala source.
diff --git a/tests/vala1.test b/tests/vala1.test
index d0cc241..0633eb0 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -2,21 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
# 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test to make sure intermediate .c files are built from vala sources
diff --git a/tests/vala2.test b/tests/vala2.test
index e559540..950c7e8 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -2,21 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
# 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test to make sure compiling Vala code really works with recursive make.
diff --git a/tests/vala3.test b/tests/vala3.test
index 138e853..1a2d78a 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -2,21 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
# 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test to make sure compiling Vala code really works with non-recursive make.
diff --git a/tests/vala4.test b/tests/vala4.test
index 7a15ebe..243f0e1 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -1,21 +1,18 @@
#! /bin/sh
# Copyright (C) 2008, 2009 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test AM_PROG_VALAC.
diff --git a/tests/vala5.test b/tests/vala5.test
index 8fc703c..f950f90 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -2,21 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
# 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,
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Boston, MA 02110-1301, USA.
# Test per-target flags.
--
1.7.1
