[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 40c1132711: Remove VCSWITNESS dependency, since we're always resc
From: |
Lars Ingebrigtsen |
Subject: |
master 40c1132711: Remove VCSWITNESS dependency, since we're always rescanning now |
Date: |
Thu, 4 Aug 2022 01:04:09 -0400 (EDT) |
branch: master
commit 40c11327118a6023745dbcbdca0564cbc6ba15da
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Remove VCSWITNESS dependency, since we're always rescanning now
* Makefile.in (VCSWITNESS): Remove, since we're always rescanning
for loaddefs.
* src/Makefile.in ($(lispsource)/loaddefs.el): Remove VCSWITNESS
dependency.
---
Makefile.in | 9 +--------
src/Makefile.in | 8 +-------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 4b74963665..bf0f52b514 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -455,18 +455,11 @@ lisp: src
lib lib-src lisp nt: Makefile
$(MAKE) -C $@ all
-# Ideally, VCSWITNESS should be a file that is modified whenever the
-# repository registers a commit from either a local checkin or a
-# repository pull. In git there is no single file that guarantees
-# this, but the local log for the current head should be close enough.
-#
# 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
- $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(BIN_DESTDIR)' \
+ $(MAKE) -C $@ BIN_DESTDIR='$(BIN_DESTDIR)' \
ELN_DESTDIR='$(ELN_DESTDIR)' all
blessmail: Makefile src
diff --git a/src/Makefile.in b/src/Makefile.in
index e81e7a16d9..8551447c8b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -886,13 +886,7 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp})
$(lisp:.elc=.eln)
fi
endif
-## VCSWITNESS points to the file that holds info about the current checkout.
-## We use it as a heuristic to decide when to rebuild loaddefs.el.
-## If empty it is ignored; the parent makefile can set it to some other value.
-VCSWITNESS =
-
-$(lispsource)/loaddefs.el: $(VCSWITNESS) | \
- bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
+$(lispsource)/loaddefs.el: | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
$(MAKE) -C ../lisp autoloads EMACS="$(bootstrap_exe)"
## Dump an Emacs executable named bootstrap-emacs containing the
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 40c1132711: Remove VCSWITNESS dependency, since we're always rescanning now,
Lars Ingebrigtsen <=