From: Glenn Morris <rgm@gnu.org>
Date: Mon, 9 Apr 2012 06:47:33 +0000 (-0700)
Subject: Generate leim-list with bootstrap-emacs, in prep for dumping it with emacs
X-Git-Tag: emacs-24.2.90~471^2~371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50fe702a88904e0e29ccda7b7b41782985a16d48;p=emacs.git

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
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1109f31f9d8..eea8345b4f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 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)
 	(Fget_buffer_create): Don't call Qucs_set_table_for_input.
 	(init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input.
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
 lib = ../lib
 libsrc = ../lib-src
 etc = ../etc
+leimdir = ../leim
 oldXMenudir = ../oldXMenu
 lwlibdir = ../lwlib
 lispdir = ../lisp
@@ -393,13 +394,16 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
 
 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?
 ## The dumped Emacs is as functional and more efficient than
 ## bootstrap-emacs, so we replace the latter with the former.
 ## Strictly speaking, emacs does not depend directly on all of $lisp,
 ## 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.
-emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
+emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
 	if test "$(CANNOT_DUMP)" = "yes"; then \
 	  ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
 	  EMACSLOADPATH=$(lispsource) ./emacs -batch \