diff options
| author | Glenn Morris | 2012-04-08 23:47:33 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-08 23:47:33 -0700 |
| commit | 50fe702a88904e0e29ccda7b7b41782985a16d48 (patch) | |
| tree | 9a4fe85e1236390393c3db4e398ad76b7af16e8b /src/Makefile.in | |
| parent | fd9d85c2d2a2bb0f159f5d13c3c7b5c900164654 (diff) | |
| download | emacs-50fe702a88904e0e29ccda7b7b41782985a16d48.tar.gz emacs-50fe702a88904e0e29ccda7b7b41782985a16d48.zip | |
Generate leim-list with bootstrap-emacs, in prep for dumping it with emacs
* src/Makefile.in: (leimdir): New variable.
($(leimdir)/leim-list.el): New rule.
(emacs$(EXEEXT)): Depend on leim-list.el.
Fixes: debbugs:4789
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 035ea277454..8c3704f830e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -49,6 +49,7 @@ lispsource = $(srcdir)/../lisp | |||
| 49 | lib = ../lib | 49 | lib = ../lib |
| 50 | libsrc = ../lib-src | 50 | libsrc = ../lib-src |
| 51 | etc = ../etc | 51 | etc = ../etc |
| 52 | leimdir = ../leim | ||
| 52 | oldXMenudir = ../oldXMenu | 53 | oldXMenudir = ../oldXMenu |
| 53 | lwlibdir = ../lwlib | 54 | lwlibdir = ../lwlib |
| 54 | lispdir = ../lisp | 55 | lispdir = ../lisp |
| @@ -393,13 +394,16 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ | |||
| 393 | 394 | ||
| 394 | all: emacs$(EXEEXT) $(OTHER_FILES) | 395 | all: emacs$(EXEEXT) $(OTHER_FILES) |
| 395 | 396 | ||
| 397 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) | ||
| 398 | cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe) | ||
| 399 | |||
| 396 | ## Does anyone ever pay attention to the load-path-shadows output here? | 400 | ## Does anyone ever pay attention to the load-path-shadows output here? |
| 397 | ## The dumped Emacs is as functional and more efficient than | 401 | ## The dumped Emacs is as functional and more efficient than |
| 398 | ## bootstrap-emacs, so we replace the latter with the former. | 402 | ## bootstrap-emacs, so we replace the latter with the former. |
| 399 | ## Strictly speaking, emacs does not depend directly on all of $lisp, | 403 | ## Strictly speaking, emacs does not depend directly on all of $lisp, |
| 400 | ## since not all pieces are used on all platforms. But DOC depends | 404 | ## since not all pieces are used on all platforms. But DOC depends |
| 401 | ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. | 405 | ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. |
| 402 | emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) | 406 | emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el |
| 403 | if test "$(CANNOT_DUMP)" = "yes"; then \ | 407 | if test "$(CANNOT_DUMP)" = "yes"; then \ |
| 404 | ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ | 408 | ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ |
| 405 | EMACSLOADPATH=$(lispsource) ./emacs -batch \ | 409 | EMACSLOADPATH=$(lispsource) ./emacs -batch \ |