Eric Blake <[EMAIL PROTECTED]> wrote:
...
> + GNUmakefile: add 'make version' target
> + * top/GNUmakefile (_curr-ver): Split version update rules...
> + (version): ...into a target.
Hi Eric,
That looks like a fine change.
Did you consider using "_version" as the new target name?
With that, GNUmakefile impinges less on the name space of all
subsidiary Makefiles.
>From 010ea87efb4115232ec12f11fc4aad4ecd1d2178 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Thu, 9 Oct 2008 10:35:37 +0200
Subject: [PATCH] GNUmakefile: use the more name-space-friendly "_version"
* top/GNUmakefile (_dummy): Update.
(_version): Rename from "version".
---
ChangeLog | 6 ++++++
top/GNUmakefile | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e4ab0f3..daf4197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-09 Jim Meyering <[EMAIL PROTECTED]>
+
+ GNUmakefile: use the more name-space-friendly "_version"
+ * top/GNUmakefile (_dummy): Update.
+ (_version): Rename from "version".
+
2008-10-08 Bruno Haible <[EMAIL PROTECTED]>
* modules/getdate-tests (test_getdata_LDADD): Add LIBINTL.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 7816416..0fdd3fa 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -72,18 +72,18 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
# should run 'autoreconf' (or something like 'make distcheck') to
# fix the version, 'make all' to propagate it, then 'make install'.
$(info WARNING: version string $(VERSION) is out of date;)
- $(info run '$(MAKE) version' to fix it)
+ $(info run '$(MAKE) _version' to fix it)
else
$(info INFO: running autoreconf for new version string: $(_curr-ver))
- _dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) version)
+ _dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) _version)
endif
endif
endif
endif
endif
-.PHONY: version
-version:
+.PHONY: _version
+_version:
cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf)
else
--
1.6.0.2.307.gc427
