Enable 'make syntax-check's sc_changelog rule.

* Makefile.maint (sc_changelog): Adapt to work with legacy
ChangeLog entry header lines.
* Makefile.cfg (local-checks-to-skip): Remove sc_changelog.

diff --git a/ChangeLog b/ChangeLog
index 8bb5e98b3e8d10f4e77e91f8e76e34062859b1de..67e8d6f9fcd69b29ce009a4bfa5ca29212da9bb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-21  Jim Meyering  <meyering@redhat.com>
+
+       Enable 'make syntax-check's sc_changelog rule.
+       * Makefile.maint (sc_changelog): Adapt to work with legacy
+       ChangeLog entry header lines.
+       * Makefile.cfg (local-checks-to-skip): Remove sc_changelog.
+
 Fri Apr 18 14:30:12 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        Work around Python.h name-space pollution.

diff --git a/Makefile.cfg b/Makefile.cfg
index 7e8ddcfb2da6f7a427295bd000ac8e8791519b4a..e0d5528722bd4ef6ec38852ea1d6b63b78382b71 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -32,7 +32,6 @@ local-checks-to-skip =                        \
   sc_GPL_version                       \
   sc_always_defined_macros             \
   sc_cast_of_alloca_return_value       \
-  sc_changelog                         \
   sc_dd_max_sym_length                 \
   sc_error_exit_success                        \
   sc_file_system                       \

diff --git a/Makefile.maint b/Makefile.maint
index 4e41134575c63acd34516f4f6f450d5b1c6d1b70..b864455b4b4df1a8b055956aed600cb1201f7345 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -166,8 +166,12 @@ sc_obsolete_symbols:
 # FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
 
 # Each nonempty line must start with a year number, or a TAB.
+# Or day-of-week+space.
+changelog_entry_header_regexp = \
+  ([12][0-9][0-9][0-9]|        .|(Mon|Tue|Wed|Thu|Fri|Sat|Sun) )
 sc_changelog:
-       @grep -n '^[^12 ]' $$(find . -maxdepth 2 -name ChangeLog) &&    \
+       @grep -Evn '(^$$|^$(changelog_entry_header_regexp))'            \
+         $$(find . -maxdepth 2 -name ChangeLog) &&                     \
          { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2;  \
            exit 1; } || :