aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-11-01 13:26:29 -0400
committerGlenn Morris2013-11-01 13:26:29 -0400
commit6014de8418e260b9bdbcc2faa6dac7e0b6324b19 (patch)
tree80a24be1205e9ff2a9f94ab6795bde39cdf16369
parent3c334c1412e708585fddba61b7f91e0902a830f4 (diff)
downloademacs-6014de8418e260b9bdbcc2faa6dac7e0b6324b19.tar.gz
emacs-6014de8418e260b9bdbcc2faa6dac7e0b6324b19.zip
* lisp/Makefile.in: Remove manual mh-e dependencies
(writing .elc files is atomic for some time, so no parallel compilation issues)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in62
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 @@
12013-11-01 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in: Remove manual mh-e dependencies (writing .elc
4 files is atomic for some time, so no parallel compilation issues).
5
12013-11-01 Jan Djärv <jan.h.d@swipnet.se> 62013-11-01 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * faces.el (face-x-resources): Add :distant-foreground. 8 * 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:
452 452
453# Dependencies 453# Dependencies
454 454
455## None of the following matters for bootstrap, which is the only way
456## to ensure a correct compilation of all lisp files.
457## Manually specifying dependencies of a handful of lisp files, (and
458## ones that don't change very often at that) seems pretty pointless
459## to me.
460
461# http://debbugs.gnu.org/1004
455# CC Mode uses a compile time macro system which causes a compile time 462# CC Mode uses a compile time macro system which causes a compile time
456# dependency in cc-*.elc files on the macros in other cc-*.el and the 463# dependency in cc-*.elc files on the macros in other cc-*.el and the
457# version string in cc-defs.el. 464# version string in cc-defs.el.
@@ -496,59 +503,4 @@ $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
496 503
497$(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc 504$(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc
498 505
499# MH-E dependencies, mainly to prevent failures with parallel
500# compilation, due to race conditions between writing a given FOO.elc
501# file and another file being compiled that says "(require FOO)",
502# which causes Emacs to try to read FOO.elc.
503$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc\
504 $(MH_E_DIR)/mh-funcs.elc $(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc\
505 $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-limit.elc\
506 $(MH_E_DIR)/mh-mime.elc $(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc\
507 $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\
508 $(MH_E_DIR)/mh-speed.elc $(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc\
509 $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\
510 $(MH_E_DIR)/mh-e.elc
511
512$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-folder.elc\
513 $(MH_E_DIR)/mh-inc.elc $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc\
514 $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-speed.elc\
515 $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\
516 $(lisp)/emacs-lisp/cl.elc
517
518$(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc\
519 $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-print.elc\
520 $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-thread.elc:\
521 $(MH_E_DIR)/mh-scan.elc
522
523$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-mime.elc\
524 $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc:\
525 $(lisp)/gnus/gnus-util.elc
526
527$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-search.elc:\
528 $(lisp)/progmodes/which-func.elc
529
530$(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\
531 $(MH_E_DIR)/mh-utils.elc:\
532 $(lisp)/font-lock.elc
533
534$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-show.elc: $(lisp)/net/goto-addr.elc
535
536$(MH_E_DIR)/mh-comp.elc: $(lisp)/mail/sendmail.elc
537
538$(MH_E_DIR)/mh-e.elc: $(MH_E_DIR)/mh-buffers.elc $(lisp)/gnus/gnus.elc \
539 $(lisp)/cus-face.elc
540
541$(MH_E_DIR)/mh-letter.elc: $(lisp)/gnus/mailcap.elc $(lisp)/gnus/mm-decode.elc \
542 $(lisp)/gnus/mm-view.elc $(lisp)/gnus/mml.elc $(lisp)/gnus/message.elc
543
544$(MH_E_DIR)/mh-print.elc: $(lisp)/ps-print.elc
545
546$(MH_E_DIR)/mh-search.elc: $(lisp)/imenu.elc
547
548$(MH_E_DIR)/mh-show.elc: $(lisp)/gnus/gnus-cite.elc
549
550$(MH_E_DIR)/mh-speed.elc: $(lisp)/speedbar.elc $(lisp)/emacs-lisp/timer.elc
551
552$(MH_E_DIR)/mh-tool-bar.elc: $(lisp)/tool-bar.elc
553
554# Makefile ends here. 506# Makefile ends here.