From 6014de8418e260b9bdbcc2faa6dac7e0b6324b19 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 1 Nov 2013 13:26:29 -0400 Subject: [PATCH] * lisp/Makefile.in: Remove manual mh-e dependencies (writing .elc files is atomic for some time, so no parallel compilation issues) --- lisp/ChangeLog | 5 ++++ lisp/Makefile.in | 62 ++++++------------------------------------------ 2 files changed, 12 insertions(+), 55 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b71b808fec8..69240aba4ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-01 Glenn Morris + + * Makefile.in: Remove manual mh-e dependencies (writing .elc + files is atomic for some time, so no parallel compilation issues). + 2013-11-01 Jan Djärv * faces.el (face-x-resources): Add :distant-foreground. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 98edb671fdb..537603a3018 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -452,6 +452,13 @@ check-declare: # Dependencies +## None of the following matters for bootstrap, which is the only way +## to ensure a correct compilation of all lisp files. +## Manually specifying dependencies of a handful of lisp files, (and +## ones that don't change very often at that) seems pretty pointless +## to me. + +# http://debbugs.gnu.org/1004 # CC Mode uses a compile time macro system which causes a compile time # dependency in cc-*.elc files on the macros in other cc-*.el and the # version string in cc-defs.el. @@ -496,59 +503,4 @@ $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc -# MH-E dependencies, mainly to prevent failures with parallel -# compilation, due to race conditions between writing a given FOO.elc -# file and another file being compiled that says "(require FOO)", -# which causes Emacs to try to read FOO.elc. -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc\ - $(MH_E_DIR)/mh-funcs.elc $(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc\ - $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-limit.elc\ - $(MH_E_DIR)/mh-mime.elc $(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\ - $(MH_E_DIR)/mh-speed.elc $(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc\ - $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\ - $(MH_E_DIR)/mh-e.elc - -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-folder.elc\ - $(MH_E_DIR)/mh-inc.elc $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-speed.elc\ - $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\ - $(lisp)/emacs-lisp/cl.elc - -$(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc\ - $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-print.elc\ - $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-thread.elc:\ - $(MH_E_DIR)/mh-scan.elc - -$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-mime.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc:\ - $(lisp)/gnus/gnus-util.elc - -$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-search.elc:\ - $(lisp)/progmodes/which-func.elc - -$(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\ - $(MH_E_DIR)/mh-utils.elc:\ - $(lisp)/font-lock.elc - -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-show.elc: $(lisp)/net/goto-addr.elc - -$(MH_E_DIR)/mh-comp.elc: $(lisp)/mail/sendmail.elc - -$(MH_E_DIR)/mh-e.elc: $(MH_E_DIR)/mh-buffers.elc $(lisp)/gnus/gnus.elc \ - $(lisp)/cus-face.elc - -$(MH_E_DIR)/mh-letter.elc: $(lisp)/gnus/mailcap.elc $(lisp)/gnus/mm-decode.elc \ - $(lisp)/gnus/mm-view.elc $(lisp)/gnus/mml.elc $(lisp)/gnus/message.elc - -$(MH_E_DIR)/mh-print.elc: $(lisp)/ps-print.elc - -$(MH_E_DIR)/mh-search.elc: $(lisp)/imenu.elc - -$(MH_E_DIR)/mh-show.elc: $(lisp)/gnus/gnus-cite.elc - -$(MH_E_DIR)/mh-speed.elc: $(lisp)/speedbar.elc $(lisp)/emacs-lisp/timer.elc - -$(MH_E_DIR)/mh-tool-bar.elc: $(lisp)/tool-bar.elc - # Makefile ends here. -- 2.39.2