Commit 50fe702a authored by Glenn Morris's avatar Glenn Morris
Browse files

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
parent fd9d85c2
2012-04-09 Glenn Morris <rgm@gnu.org> 2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in: Generate leim-list with bootstrap-emacs, in
preparation for dumping it with emacs. (Bug#4789)
(leimdir): New variable.
($(leimdir)/leim-list.el): New rule.
(emacs$(EXEEXT)): Depend on leim-list.el.
* buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821) * buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821)
(Fget_buffer_create): Don't call Qucs_set_table_for_input. (Fget_buffer_create): Don't call Qucs_set_table_for_input.
(init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input.
......
...@@ -49,6 +49,7 @@ lispsource = $(srcdir)/../lisp ...@@ -49,6 +49,7 @@ lispsource = $(srcdir)/../lisp
lib = ../lib lib = ../lib
libsrc = ../lib-src libsrc = ../lib-src
etc = ../etc etc = ../etc
leimdir = ../leim
oldXMenudir = ../oldXMenu oldXMenudir = ../oldXMenu
lwlibdir = ../lwlib lwlibdir = ../lwlib
lispdir = ../lisp lispdir = ../lisp
...@@ -393,13 +394,16 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ ...@@ -393,13 +394,16 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
all: emacs$(EXEEXT) $(OTHER_FILES) all: emacs$(EXEEXT) $(OTHER_FILES)
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe)
## Does anyone ever pay attention to the load-path-shadows output here? ## Does anyone ever pay attention to the load-path-shadows output here?
## The dumped Emacs is as functional and more efficient than ## The dumped Emacs is as functional and more efficient than
## bootstrap-emacs, so we replace the latter with the former. ## bootstrap-emacs, so we replace the latter with the former.
## Strictly speaking, emacs does not depend directly on all of $lisp, ## Strictly speaking, emacs does not depend directly on all of $lisp,
## since not all pieces are used on all platforms. But DOC depends ## since not all pieces are used on all platforms. But DOC depends
## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
if test "$(CANNOT_DUMP)" = "yes"; then \ if test "$(CANNOT_DUMP)" = "yes"; then \
ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
EMACSLOADPATH=$(lispsource) ./emacs -batch \ EMACSLOADPATH=$(lispsource) ./emacs -batch \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment