Merge branch 'maint'

9 files changed, 33 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index abd5fb1fe..1e6191ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Formatting cleanups in macro comments.
+	* automake.in, lib/Automake/Channels.pm,
+	lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
+	lib/Automake/Variable.pm, lib/Automake/XFile.pm,
+	m4/options.m4, m4/substnot.m4: Fix macro comment format.
+
 2010-03-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/automake.in b/automake.in
index c0bf14687..d5e3ec21c 100644
--- a/automake.in
+++ b/automake.in
@@ -6517,7 +6517,7 @@ sub define_variable ($$$)
 
 
 # define_files_variable ($VAR, \@BASENAME, $EXTENSION, $WHERE)
-# -----------------------------------------------------------
+# ------------------------------------------------------------
 # Define the $VAR which content is the list of file names composed of
 # a @BASENAME and the $EXTENSION.
 sub define_files_variable ($\@$$)
@@ -6655,7 +6655,7 @@ sub define_per_target_linker_variable ($$)
 ################################################################
 
 # &check_trailing_slash ($WHERE, $LINE)
-# --------------------------------------
+# -------------------------------------
 # Return 1 iff $LINE ends with a slash.
 # Might modify $LINE.
 sub check_trailing_slash ($\$)
@@ -8067,7 +8067,7 @@ sub require_conf_file_with_macro ($$$@)
 ################################################################
 
 # &require_build_directory ($DIRECTORY)
-# ------------------------------------
+# -------------------------------------
 # Emit rules to create $DIRECTORY if needed, and return
 # the file that any target requiring this directory should be made
 # dependent upon.
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index e94819ea4..223d8d203 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2006, 2008, 2010 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
@@ -427,7 +428,7 @@ sub _format_message ($$%)
 }
 
 # _enqueue ($QUEUE, $KEY, $UNIQ_SCOPE, $TO_FILTER, $MSG, $FILE)
-# ------------------------------------------------------------
+# -------------------------------------------------------------
 # Push message on a queue, to be processed by another thread.
 sub _enqueue ($$$$$$)
 {
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 203c7de74..e39750d30 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 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
@@ -93,7 +94,7 @@ if absent, otherwise exit with error.
 
 # $FILE_NAME
 # find_file ($FILE_NAME, @INCLUDE)
-# -------------------------------
+# --------------------------------
 sub find_file ($@)
 {
   use File::Spec;
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 8d004d9b0..0c388386d 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 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
@@ -234,7 +235,7 @@ Return 1 on error, 0 otherwise.
 
 # $BOOL
 # _process_option_list (\%OPTIONS, $WHERE, @OPTIONS)
-# -------------------------------------------------
+# --------------------------------------------------
 # Process a list of options.  Return 1 on error, 0 otherwise.
 # \%OPTIONS is the hash to fill with options data, $WHERE is
 # the location where @OPTIONS occurred.
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 30dcc7972..c340dc70d 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 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
@@ -1515,7 +1516,7 @@ sub _hash_values (@)
 }
 # ($VARNAME, $GENERATED)
 # _gen_varname ($BASE, @DEFINITIONS)
-# ---------------------------------
+# ----------------------------------
 # Return a variable name starting with $BASE, that will be
 # used to store definitions @DEFINITIONS.
 # @DEFINITIONS is a list of pair [$COND, @OBJECTS].
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index b67e2517a..a7bb21958 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010 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
diff --git a/m4/options.m4 b/m4/options.m4
index 8e5017e8c..6824d84fa 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -1,12 +1,13 @@
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -14,13 +15,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index 811d28685..a4cbdf58c 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -1,11 +1,11 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -14,6 +14,6 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])