diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7a6b38f3b90..1b77d1c9aa1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-10-07 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in ($(srcdir)/macuvs.h) | ||
| 4 | ($(lispsource)/international/charprop.el): Add explicit FORCE. | ||
| 5 | |||
| 1 | 2014-10-07 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-10-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * decompress.c (init_zlib_functions): Move the message about zlib | 8 | * decompress.c (init_zlib_functions): Move the message about zlib |
diff --git a/src/Makefile.in b/src/Makefile.in index dfa5854489b..dffb77e7338 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -437,8 +437,12 @@ all: emacs$(EXEEXT) $(OTHER_FILES) | |||
| 437 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) | 437 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) |
| 438 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" | 438 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" |
| 439 | 439 | ||
| 440 | ## FORCE it so that admin/unidata can decide whether these files | ||
| 441 | ## are up-to-date. Although since charprop depends on bootstrap-emacs, | ||
| 442 | ## and emacs (which recreates bootstrap-emacs) depends on charprop, | ||
| 443 | ## in practice this rule was always run anyway. | ||
| 440 | $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ | 444 | $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ |
| 441 | bootstrap-emacs$(EXEEXT) | 445 | bootstrap-emacs$(EXEEXT) FORCE |
| 442 | $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" | 446 | $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" |
| 443 | 447 | ||
| 444 | ## The dumped Emacs is as functional and more efficient than | 448 | ## The dumped Emacs is as functional and more efficient than |