[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [NITPICKING] Missing copyright notice in tests/Makefile.am
|
From: |
Ralf Wildenhues |
|
Subject: |
Re: [NITPICKING] Missing copyright notice in tests/Makefile.am |
|
Date: |
Tue, 29 Dec 2009 19:47:35 +0100 |
|
User-agent: |
Mutt/1.5.20 (2009-10-28) |
Hi Stefano,
* Stefano Lattarini wrote on Sat, Dec 26, 2009 at 02:46:02PM CET:
> I see that the file `tests/Makefile.am' in the Automake repository
> doesn't include any copyright notice. All the others Makefile.am files,
> even those simpler/shorter (e.g. `lib/Automake/tests/Makefile.am'), do
> include a proper copyright statement.
>
> Is this intentional, or the result of an overlooking?
Oversight.
It is also an error that we use '##'-style double-hash comments for
copyright notices, because that will let them not end up in the
generated Makefile.in files; and while Automake adds all-permissive
copyright statements to these files, it does not necessarily apply to
the text coming from the Makefile.am files which are under GPLv2+.
I'm queuing this to maint, intended for master and branch-1.11.
Thanks,
Ralf
Fix and complete copyright notices in Makefile.am files.
* Makefile.am: Use single-`#' comment for copyright notice, so
that it also appears in the generated Makefile.in file.
* doc/Makefile.am: Likewise.
* doc/amhello/Makefile.am: Likewise.
* doc/amhello/src/Makefile.am: Likewise.
* lib/Automake/Makefile.am: Likewise.
* lib/Automake/tests/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/am/Makefile.am: Likewise.
* m4/Makefile.am: Likewise.
* tests/Makefile.am: Add copyright notice.
Report of missing copyright notice by Stefano Lattarini.
diff --git a/Makefile.am b/Makefile.am
index 0c3f438..49f3138 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,21 @@
## Makefile for Automake.
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-## 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
## lib goes first, because it builds Config.pm, used by aclocal and
## automake (run in doc, tests, and in the rebuild rules.)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index acdf0fa..01cf663 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,20 +2,20 @@
## Makefile for Automake.
-## Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2008, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
info_TEXINFOS = automake.texi
automake_TEXINFOS = fdl.texi
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index a69ace3..469aeb9 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,6 +1,6 @@
-## Copyright (C) 2006 Free Software Foundation, Inc.
-## This Makefile.am is free software; the Free Software Foundation
-## gives unlimited permission to copy, distribute and modify it.
+# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# This Makefile.am is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
SUBDIRS = src
dist_doc_DATA = README
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 579660c..9642aa0 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,6 +1,6 @@
-## Copyright (C) 2006 Free Software Foundation, Inc.
-## This Makefile.am is free software; the Free Software Foundation
-## gives unlimited permission to copy, distribute and modify it.
+# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# This Makefile.am is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
bin_PROGRAMS = hello
hello_SOURCES = main.c
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index ff5b950..c0b536c 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,19 +1,20 @@
## Process this file with automake to create Makefile.in
-## Copyright (C) 2001, 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# `make clean check' should build Config.pm first.
SUBDIRS = . tests
diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am
index 722c75c..b4f09f1 100644
--- a/lib/Automake/tests/Makefile.am
+++ b/lib/Automake/tests/Makefile.am
@@ -1,19 +1,19 @@
## Process this file with automake to create Makefile.in
-## Copyright (C) 2002, 2003, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2008, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
PL_LOG_COMPILER = $(PERL)
AM_PL_LOG_FLAGS = -Mstrict -I ../.. -I $(top_srcdir)/lib -w
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f5bd0bc..627368d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,20 +2,20 @@
## Makefile for Automake lib.
-## Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = Automake am
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index d3ba4f4..a255f70 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -2,21 +2,21 @@
## Makefile for Automake lib/am.
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2008
-## Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2008,
+# 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
amdir = $(pkgvdatadir)/am
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3ea8840..0cf074b 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,21 +2,21 @@
## Makefile for Automake m4.
-## Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
-## 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
+# 2008, 2009 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4datadir = $(datadir)/aclocal-$(APIVERSION)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8936ff1..449a36c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,21 @@
## Process this file with automake to create Makefile.in
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009 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/>.
+
XFAIL_TESTS = \
all.test \
auxdir2.test \