[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint.mk: fix some fallout
From: |
Eric Blake |
Subject: |
[PATCH] maint.mk: fix some fallout |
Date: |
Fri, 2 Apr 2010 08:50:26 -0600 |
Also rearrange ChangeLog to match commit order.
* NEWS: Document the incompatible change, and its effect on cfg.mk.
* top/maint.mk (sc_prohibit_test_minus_ao): Update.
Signed-off-by: Eric Blake <address@hidden>
---
> I've folded those patches plus one more (here)
> into your 3/3 and pushed the result:
>
I'm pushing this followup - anyone that updates to the latest gnulib
and has custom cfg.mk rules (think libvirt, for example) will need to
rewrite them in terms of the new and improved _sc_search_regexp.
ChangeLog | 36 ++++++++++++++++++++++--------------
NEWS | 5 +++++
top/maint.mk | 6 +++---
3 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 716d815..f463e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,8 @@
-2010-03-31 Eric Blake <address@hidden>
-
- maint.mk: check for [ as well as test
- * top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
- Based on a libvirt report by Matthias Bolte.
-
- gnumakefile: don't squelch _version output
- * top/GNUmakefile (_version): Create one-shot dependency rather
- than using $(shell) when version must be regenerated.
- (_autoreconf): Run verbosely, by default.
+2010-04-02 Eric Blake <address@hidden>
- sys_time: avoid compiler warnings
- * lib/sys_time.in.h (includes): Ensure gcc pragma is
- unconditional, fixing regression from 2010-03-29.
- Reported by Simon Josefsson.
+ maint.mk: fix some fallout
+ * NEWS: Document the incompatible change, and its effect on cfg.mk.
+ * top/maint.mk (sc_prohibit_test_minus_ao): Update.
2010-03-28 Jose E. Marchesi <address@hidden>
@@ -58,6 +48,24 @@
(sc_error_message_uppercase): Likewise.
(sc_error_message_period): Likewise.
+2010-03-31 Eric Blake <address@hidden>
+
+ maint.mk: check for [ as well as test
+ * top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
+ Based on a libvirt report by Matthias Bolte.
+
+ gnumakefile: don't squelch _version output
+ * top/GNUmakefile (_version): Create one-shot dependency rather
+ than using $(shell) when version must be regenerated.
+ (_autoreconf): Run verbosely, by default.
+
+ sys_time: avoid compiler warnings
+ * lib/sys_time.in.h (includes): Ensure gcc pragma is
+ unconditional, fixing regression from 2010-03-29.
+ Reported by Simon Josefsson.
+
+2010-03-28 Jose E. Marchesi <address@hidden>
+
maint.mk: s/_header_without_use/_sc_header_without_use/
* top/maint.mk (_sc_header_without_use): Rename from
_header_without_use.
(sc_prohibit_assert_without_use): Use the new name.
diff --git a/NEWS b/NEWS
index 778e3b9..bb94b03 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ User visible incompatible changes
Date Modules Changes
+2010-04-02 maintainer-makefile
+ The macro _prohibit_regexp has been revamped into
+ a new macro _sc_search_regexp; custom syntax
+ checks in your cfg.mk will need to be rewritten.
+
2010-03-28 lib-ignore This module now provides a variable
IGNORE_UNUSED_LIBRARIES_CFLAGS that you should
add to LDFLAGS (when linking C programs only) or
diff --git a/top/maint.mk b/top/maint.mk
index 9cfe172..13a0438 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -670,9 +670,9 @@ _ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
# Using test's -a and -o operators is not portable.
# We prefer test over [, since the latter is spelled [[ in configure.ac.
sc_prohibit_test_minus_ao:
- @re='(\<test| \[+) .+ -[ao] ' \
- msg='$(_ptm1); $(_ptm2)' \
- $(_prohibit_regexp)
+ @prohibit='(\<test| \[+) .+ -[ao] ' \
+ halt='$(_ptm1); $(_ptm2)' \
+ $(_sc_search_regexp)
# Each program that uses proper_name_utf8 must link with one of the
# ICONV libraries. Otherwise, some ICONV library must appear in LDADD.
--
1.6.6.1