From a3787fd48ac76b0ca2009f180337ccbbffe85e22 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 27 Nov 2006 21:35:37 +0000 Subject: [PATCH] * Makefile.am: Put only a single '#' into the copyright notice, so that it's also present in the output file. Standardize wording in makefile copyright notices to match GNU coding standards. * bin/Makefile.am: Likewise. * doc/Makefile.am: Likewise. * lib/Makefile.am: Likewise. * lib/freeze.mk: Likewise. * lib/autoconf/Makefile.am: Likewise. * lib/autoscan/Makefile.am: Likewise. * lib/autotest/Makefile.am: Likewise. * lib/m4sugar/Makefile.am: Likewise. * man/Makefile.am: Likewise. * tests/Makefile.am: Likewise. * lib/emacs/Makefile.am: Remove copyright notice; it's just a one-line file. --- ChangeLog | 18 ++++++++++++++++++ Makefile.am | 32 +++++++++++++++----------------- bin/Makefile.am | 32 +++++++++++++++----------------- doc/Makefile.am | 29 ++++++++++++++--------------- lib/Makefile.am | 35 ++++++++++++++++++----------------- lib/autoconf/Makefile.am | 36 ++++++++++++++++++------------------ lib/autoscan/Makefile.am | 36 ++++++++++++++++++------------------ lib/autotest/Makefile.am | 36 ++++++++++++++++++------------------ lib/emacs/Makefile.am | 23 +++-------------------- lib/freeze.mk | 36 ++++++++++++++++++------------------ lib/m4sugar/Makefile.am | 32 ++++++++++++++++---------------- man/Makefile.am | 26 +++++++++++++------------- tests/Makefile.am | 34 +++++++++++++++++----------------- 13 files changed, 201 insertions(+), 204 deletions(-) rewrite lib/emacs/Makefile.am (94%) diff --git a/ChangeLog b/ChangeLog index aa45cda0..ba65266a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-11-27 Paul Eggert + + * Makefile.am: Put only a single '#' into the copyright notice, + so that it's also present in the output file. Standardize wording + in makefile copyright notices to match GNU coding standards. + * bin/Makefile.am: Likewise. + * doc/Makefile.am: Likewise. + * lib/Makefile.am: Likewise. + * lib/freeze.mk: Likewise. + * lib/autoconf/Makefile.am: Likewise. + * lib/autoscan/Makefile.am: Likewise. + * lib/autotest/Makefile.am: Likewise. + * lib/m4sugar/Makefile.am: Likewise. + * man/Makefile.am: Likewise. + * tests/Makefile.am: Likewise. + * lib/emacs/Makefile.am: Remove copyright notice; it's just a + one-line file. + 2006-11-27 Ralf Wildenhues * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix error diff --git a/Makefile.am b/Makefile.am index d51e2b39..d4ad5b99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,24 +1,22 @@ -## Process this file with automake to create Makefile.in. -*-Makefile-*- +# Make Autoconf. -## Makefile for Autoconf. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free +# Software Foundation, Inc. -## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # bin/ must be run first, as it builds executables needed for tests. # autom4te uses autotest.m4f to generate `testsuite', so build tests last. diff --git a/bin/Makefile.am b/bin/Makefile.am index 7a1b0780..26d35299 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,24 +1,22 @@ -## Process this file with automake to create Makefile.in. -*-Makefile-*- +# Make Autoconf commands. -## Makefile for Autoconf. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free +# Software Foundation, Inc. -## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. include ../lib/freeze.mk diff --git a/doc/Makefile.am b/doc/Makefile.am index 77fb0dd4..0073a4ac 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,22 +1,21 @@ -## Process this file with automake to create Makefile.in. +# Make Autoconf documentation. -## Makefile for Autoconf. -## Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. AM_MAKEINFOFLAGS = --no-split TEXI2DVI = texi2dvi --batch diff --git a/lib/Makefile.am b/lib/Makefile.am index 8936ff24..e37e41fd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,21 +1,22 @@ -## Process this file with automake to create Makefile.in +# Make Autoconf-related libraries. -## Copyright (C) 2001, 2002, 2003, 2004, 2005 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Copyright (C) 2001, 2002, 2003, 2004, 2005 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs nodist_pkgdata_DATA = autom4te.cfg diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am index a70211e4..e46f1417 100644 --- a/lib/autoconf/Makefile.am +++ b/lib/autoconf/Makefile.am @@ -1,21 +1,21 @@ -## Process this file with automake to create Makefile.in - -## Copyright (C) 2001, 2002, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Make Autoconf library. + +# Copyright (C) 2001, 2002, 2006 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. autoconflibdir = $(pkgdatadir)/autoconf dist_autoconflib_DATA = \ diff --git a/lib/autoscan/Makefile.am b/lib/autoscan/Makefile.am index 11dd4cc2..9d440ca4 100644 --- a/lib/autoscan/Makefile.am +++ b/lib/autoscan/Makefile.am @@ -1,21 +1,21 @@ -## Process this file with automake to create Makefile.in - -## Copyright 2001, 2002 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Make Autoscan library. + +# Copyright (C) 2001, 2002 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. autoscanlibdir = $(pkgdatadir)/autoscan diff --git a/lib/autotest/Makefile.am b/lib/autotest/Makefile.am index 5bc1b049..91da695c 100644 --- a/lib/autotest/Makefile.am +++ b/lib/autotest/Makefile.am @@ -1,21 +1,21 @@ -## Process this file with automake to create Makefile.in - -## Copyright (C) 2001, 2002 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Make Autotest library. + +# Copyright (C) 2001, 2002 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. autotestlibdir = $(pkgdatadir)/autotest dist_autotestlib_DATA = autotest.m4 general.m4 diff --git a/lib/emacs/Makefile.am b/lib/emacs/Makefile.am dissimilarity index 94% index fba457e2..aa622070 100644 --- a/lib/emacs/Makefile.am +++ b/lib/emacs/Makefile.am @@ -1,20 +1,3 @@ -## Process this file with automake to create Makefile.in - -## Copyright 2001 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. - -dist_lisp_LISP = autoconf-mode.el autotest-mode.el +# Make Autoconf Emacs library. + +dist_lisp_LISP = autoconf-mode.el autotest-mode.el diff --git a/lib/freeze.mk b/lib/freeze.mk index 025f4dad..c1a6ece8 100644 --- a/lib/freeze.mk +++ b/lib/freeze.mk @@ -1,21 +1,21 @@ -## Freeze M4 files. - -## Copyright (C) 2002, 2004, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Freeze M4 files. + +# Copyright (C) 2002, 2004, 2006 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. ## ----------------- ## diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am index 08bb99e8..6bf6bc01 100644 --- a/lib/m4sugar/Makefile.am +++ b/lib/m4sugar/Makefile.am @@ -1,21 +1,21 @@ # Make Autoconf library for M4sugar. -## Copyright (C) 2001, 2002, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Copyright (C) 2001, 2002, 2006 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. m4sugarlibdir = $(pkgdatadir)/m4sugar dist_m4sugarlib_DATA = m4sugar.m4 m4sh.m4 diff --git a/man/Makefile.am b/man/Makefile.am index 067e12c3..11e60d36 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,21 +1,21 @@ # Make Autoconf man pages. -## Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2004, 2005, 2006 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. dist_man_MANS = \ $(srcdir)/autoconf.1 \ diff --git a/tests/Makefile.am b/tests/Makefile.am index ca8f7eba..4447d76b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,22 +1,22 @@ ## Make Autoconf tests. -## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 -## 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # We don't actually distribute the testsuite, since one only # needs m4 to build it, m4 being required anyway to install Autoconf. -- 2.11.4.GIT