[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ed51b8d 1/7: Less 'make' chatter for VCSWITNESS
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master ed51b8d 1/7: Less 'make' chatter for VCSWITNESS |
Date: |
Sun, 04 Jan 2015 02:54:41 +0000 |
branch: master
commit ed51b8df3c25da47431d4d4cc2af0ff9db2f0421
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Less 'make' chatter for VCSWITNESS
* Makefile.in (dirstate, VCSWITNESS): New macros.
(src): Use them to lessen 'make' chatter.
---
ChangeLog | 6 ++++++
Makefile.in | 10 ++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0efa32a..9207bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-04 Paul Eggert <address@hidden>
+
+ Less 'make' chatter for VCSWITNESS
+ * Makefile.in (dirstate, VCSWITNESS): New macros.
+ (src): Use them to lessen 'make' chatter.
+
2015-01-01 Paul Eggert <address@hidden>
Fix copyright years by hand
diff --git a/Makefile.in b/Makefile.in
index b8d914b..7b271f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,15 +389,13 @@ lib lib-src lisp nt: Makefile
# repository pull. In git there is no single file that guarantees
# this, but the local log for the current head should be close enough.
#
-# Note the use of single quotes in the value of vcswitness.
-# This passes an unexpanded $srcdir to src's Makefile, which then
+# Pass an unexpanded $srcdir to src's Makefile, which then
# expands it using its own value of srcdir (which points to the
# source directory of src/).
+dirstate = .git/logs/HEAD
+VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
src: Makefile
- dirstate='.git/logs/HEAD'; \
- vcswitness='$$(srcdir)/../'$$dirstate; \
- [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \
- $(MAKE) -C $@ all VCSWITNESS="$$vcswitness"
+ $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
blessmail: Makefile src
$(MAKE) -C lib-src maybe-blessmail
- [Emacs-diffs] master updated (cd2d58c -> 35127c3), Paul Eggert, 2015/01/03
- [Emacs-diffs] master ed51b8d 1/7: Less 'make' chatter for VCSWITNESS,
Paul Eggert <=
- [Emacs-diffs] master 4e23582 2/7: Less 'make' chatter for admin/grammars, Paul Eggert, 2015/01/03
- [Emacs-diffs] master c895d02 3/7: Less 'make' chatter for leim, Paul Eggert, 2015/01/03
- [Emacs-diffs] master ccb2d93 5/7: Less 'make' chatter for lisp dir, Paul Eggert, 2015/01/03
- [Emacs-diffs] master 35127c3 7/7: Less 'make' chatter for oldXMenu, Paul Eggert, 2015/01/03
- [Emacs-diffs] master 0d85a0c 4/7: Less 'make' chatter for lib-src, Paul Eggert, 2015/01/03
- [Emacs-diffs] master 4d12b55 6/7: Less 'make' chatter for lwlib, Paul Eggert, 2015/01/03