From f1175f85bd942b990c57e6c7887ce5b4566fbc67 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 29 Dec 2009 19:42:41 +0100 Subject: [PATCH] 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. Signed-off-by: Ralf Wildenhues --- ChangeLog | 16 ++++++++++++++++ Makefile.am | 24 ++++++++++++------------ Makefile.in | 16 ++++++++++++++++ doc/Makefile.am | 22 +++++++++++----------- doc/Makefile.in | 15 +++++++++++++++ doc/amhello/Makefile.am | 6 +++--- doc/amhello/src/Makefile.am | 6 +++--- lib/Automake/Makefile.am | 23 ++++++++++++----------- lib/Automake/Makefile.in | 16 ++++++++++++++++ lib/Automake/tests/Makefile.am | 22 +++++++++++----------- lib/Automake/tests/Makefile.in | 15 +++++++++++++++ lib/Makefile.am | 22 +++++++++++----------- lib/Makefile.in | 15 +++++++++++++++ lib/am/Makefile.am | 24 ++++++++++++------------ lib/am/Makefile.in | 16 ++++++++++++++++ m4/Makefile.am | 24 ++++++++++++------------ m4/Makefile.in | 16 ++++++++++++++++ tests/Makefile.am | 16 ++++++++++++++++ tests/Makefile.in | 16 ++++++++++++++++ 19 files changed, 244 insertions(+), 86 deletions(-) diff --git a/ChangeLog b/ChangeLog index e00fd3da3..063c06ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2009-12-29 Ralf Wildenhues + + 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. + 2009-12-27 Stefano Lattarini Fixed typo in Makefile.am (extra semicolon removed) diff --git a/Makefile.am b/Makefile.am index 3cd404a0c..e9e7e74d8 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . ## 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/Makefile.in b/Makefile.in index 6fab18da6..b11abb61f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,6 +15,22 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/doc/Makefile.am b/doc/Makefile.am index c794766f4..bb48fa238 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . info_TEXINFOS = automake.texi automake_TEXINFOS = fdl.texi diff --git a/doc/Makefile.in b/doc/Makefile.in index 1deaa3063..41bbed1cb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -15,6 +15,21 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am index a69ace362..469aeb989 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 579660ccf..9642aa042 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 173b18e68..3b9b86329 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # `make clean check' should build Config.pm first. SUBDIRS = . tests diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 95c67bf4e..525939cbb 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -15,6 +15,22 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am index b8fb76194..c5e53d2cf 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . PL_LOG_COMPILER = $(PERL) AM_PL_LOG_FLAGS = -Mstrict -I ../.. -I $(top_srcdir)/lib -w diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index e44898b60..5f0a27878 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -14,6 +14,21 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# 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 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 . VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/lib/Makefile.am b/lib/Makefile.am index f5bd0bc29..627368de5 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . SUBDIRS = Automake am diff --git a/lib/Makefile.in b/lib/Makefile.in index ac7f26b82..52b716b74 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,6 +15,21 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index d3ba4f478..a255f701d 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . amdir = $(pkgvdatadir)/am diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 0ea9842b7..043c4363d 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -15,6 +15,22 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/m4/Makefile.am b/m4/Makefile.am index 3ea8840d4..0cf074b4e 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 . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . m4datadir = $(datadir)/aclocal-$(APIVERSION) diff --git a/m4/Makefile.in b/m4/Makefile.in index be63131da..15215e339 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -15,6 +15,22 @@ @SET_MAKE@ +# 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 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 . + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c2e89a85..73011dcdc 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 . + XFAIL_TESTS = \ all.test \ auxdir2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 96bad893a..a32b0a61a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -14,6 +14,22 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# 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 . VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -- 2.47.2