diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/Makefile.in | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 089749ac028..658825d2ba8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-06-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in ($(lisp)/progmodes/cc-defs.elc) | ||
| 4 | ($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc) | ||
| 5 | ($(lisp)/progmodes/cc-vars.elc): Drop hand-written deps on non-cc | ||
| 6 | files. They are not relevant to the original issue (bug#1004), | ||
| 7 | and cause unnecessary recompilation (bug#2151). | ||
| 8 | |||
| 1 | 2014-06-25 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2014-06-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * play/landmark.el: Use lexical-binding and avoid `intangible'. | 11 | * play/landmark.el: Use lexical-binding and avoid `intangible'. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index cbc1d2af3ae..d6e10c6a4ab 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -519,28 +519,22 @@ $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\ | |||
| 519 | $(lisp)/progmodes/cc-vars.elc: \ | 519 | $(lisp)/progmodes/cc-vars.elc: \ |
| 520 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc | 520 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc |
| 521 | 521 | ||
| 522 | $(lisp)/progmodes/cc-align.elc: \ | 522 | $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-cmds.elc: \ |
| 523 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc | ||
| 524 | |||
| 525 | $(lisp)/progmodes/cc-cmds.elc: \ | ||
| 526 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc | 523 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc |
| 527 | 524 | ||
| 528 | $(lisp)/progmodes/cc-compat.elc: \ | 525 | $(lisp)/progmodes/cc-compat.elc: \ |
| 529 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-styles.elc \ | 526 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-styles.elc \ |
| 530 | $(lisp)/progmodes/cc-engine.elc | 527 | $(lisp)/progmodes/cc-engine.elc |
| 531 | 528 | ||
| 532 | $(lisp)/progmodes/cc-defs.elc: $(lisp)/progmodes/cc-bytecomp.elc \ | 529 | $(lisp)/progmodes/cc-defs.elc: $(lisp)/progmodes/cc-bytecomp.elc |
| 533 | $(lisp)/emacs-lisp/cl.elc $(lisp)/emacs-lisp/regexp-opt.elc | ||
| 534 | 530 | ||
| 535 | $(lisp)/progmodes/cc-engine.elc: $(lisp)/progmodes/cc-langs.elc \ | 531 | $(lisp)/progmodes/cc-engine.elc: $(lisp)/progmodes/cc-langs.elc \ |
| 536 | $(lisp)/progmodes/cc-vars.elc | 532 | $(lisp)/progmodes/cc-vars.elc |
| 537 | 533 | ||
| 538 | $(lisp)/progmodes/cc-fonts.elc: $(lisp)/progmodes/cc-langs.elc \ | 534 | $(lisp)/progmodes/cc-fonts.elc: $(lisp)/progmodes/cc-langs.elc \ |
| 539 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \ | 535 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc |
| 540 | $(lisp)/font-lock.elc | ||
| 541 | 536 | ||
| 542 | $(lisp)/progmodes/cc-langs.elc: $(lisp)/progmodes/cc-vars.elc \ | 537 | $(lisp)/progmodes/cc-langs.elc: $(lisp)/progmodes/cc-vars.elc |
| 543 | $(lisp)/emacs-lisp/cl.elc | ||
| 544 | 538 | ||
| 545 | $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \ | 539 | $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \ |
| 546 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \ | 540 | $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \ |
| @@ -550,6 +544,4 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \ | |||
| 550 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ | 544 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ |
| 551 | $(lisp)/progmodes/cc-align.elc | 545 | $(lisp)/progmodes/cc-align.elc |
| 552 | 546 | ||
| 553 | $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc | ||
| 554 | |||
| 555 | # Makefile ends here. | 547 | # Makefile ends here. |