Remove broken VCSWITNESS code, and explain the problem.

5 files changed, 16 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 52519f3382c..98681e9c705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-12  Eric S. Raymond  <esr@thyrsus.com>
+
+        * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS
+        code, and explain the problem.
+
 2014-01-12  Glenn Morris  <rgm@gnu.org>
 
         * README: Replace reference to etc/MAILINGLISTS.
diff --git a/Makefile.in b/Makefile.in
index 065e192d3ae..8ef97601537 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -374,16 +374,12 @@ lib lib-src lisp nt: Makefile FRC
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
 src: Makefile FRC
-        dirstate='.bzr/checkout/dirstate';                              \
-        vcswitness='$$(srcdir)/../'$$dirstate;                          \
-        [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
         cd $@ || exit;                                                  \
         boot=bootstrap-emacs$(EXEEXT);                                  \
         [ ! -x "$$boot" ] || boot='';                                   \
         $(MAKE) all $(MFLAGS)                                           \
           CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'          \
-          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"   \
-          VCSWITNESS="$$vcswitness"
+          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"
 
 blessmail: Makefile src FRC
         cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index c3e172ec119..57b055eb015 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2429,6 +2429,12 @@ The causes of this problem are not understood.  Using GNU make 3.81 compiled
 from source, rather than the Ubuntu version, worked.
 See <URL:http://debbugs.gnu.org/327, <URL:http://debbugs.gnu.org/821>.
 
+*** Rebuild of loaddefs.el is not always done after Lisp changes
+
+The rebuild production should depend on all Lisp files with #autoload
+cookies.  It doesn't yet.  This needs a configure-time improvement to
+the nuild system.
+
 ** Dumping
 
 *** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b6065b7630..d113d60af83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -36,7 +36,7 @@
 
 2014-01-11  Eric S. Raymond  <esr@thyrsus.com>
 
-        * version.el (emacs-repository-get-version): Enhancee so the
+        * version.el (emacs-repository-get-version): Enhance so the
         function works correctly in either a Bazaar or Git repo. The
         Bazaar case can be discarded  after the repo transition.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 388923596c9..b8ec4fdf352 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -629,12 +629,10 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
 ## Since the .el.elc rule cannot specify an extra dependency, we do it here.
 $(lisp): $(BOOTSTRAPEMACS)
 
-## 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 =
+## This ought to depend on every Lisp file that contains an autoload cookie.
+## A task for the future...
 
-$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
+$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS)
         cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)"
 
 ## Dump an Emacs executable named bootstrap-emacs containing the