Cleaner solution for Org version updates

* lisp/Makefile.in (BYTE_COMPILE_FLAGS): Set org--built-in-p
non-nil, to avoid aborting the build when Org's version is bumped.
($(lisp)/org/org.elc): Remove dependencies of org-version.el, as
no longer needed.  (Bug#62762)

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 437667e75868fb70048ba22a4183a8d2f290c653..4aa01e77e4e0d9e7662df0d4d79e6b8732a3b04c 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -74,7 +74,7 @@ AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
 # Set load-prefer-newer for the benefit of the non-bootstrappers.
 BYTE_COMPILE_FLAGS = \
   --eval "(setq load-prefer-newer t byte-compile-warnings 'all)" \
-       $(BYTE_COMPILE_EXTRA_FLAGS)
+  --eval "(setq org--built-in-p t)" $(BYTE_COMPILE_EXTRA_FLAGS)
 # ... but we must prefer .elc files for those in the early bootstrap.
 compile-first: BYTE_COMPILE_FLAGS = $(BYTE_COMPILE_EXTRA_FLAGS)
 
@@ -543,12 +543,4 @@ $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
 $(lisp)/progmodes/js.elc: $(lisp)/progmodes/cc-defs.elc \
    $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-mode.elc
 
-# When org-version.el gets updated with a new version, all the Org
-# files need to be recompiled, or else the build will fail due to
-# version mismatch, prompting the naive users to bootstrap.  So we
-# make all the Org *.elc files dependent of org-version.el, to trigger
-# their recompilation automatically.
-$(lisp)/org/org.elc $(filter-out $(lisp)/org/org-version.elc,$(filter-out $(lisp)/org/org.elc,$(wildcard $(lisp)/org/*.elc))): \
-   $(lisp)/org/org-version.el
-
 # Makefile ends here.