[Emacs-diffs] /srv/bzr/emacs/trunk r107806: Generate leim-list with bootstrap-emacs, in prep for dumping it with emacs

[Glenn Morris]

------------------------------------------------------------
revno: 107806
fixes bug(s): http://debbugs.gnu.org/4789
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-08 23:47:33 -0700
message:
  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.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-09 00:58:00 +0000
+++ b/src/ChangeLog     2012-04-09 06:47:33 +0000
@@ -1,5 +1,11 @@
 2012-04-09  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-01-19 07:21:25 +0000
+++ b/src/Makefile.in   2012-04-09 06:47:33 +0000
@@ -49,6 +49,7 @@
 lib = ../lib
 libsrc = ../lib-src
 etc = ../etc
+leimdir = ../leim
 oldXMenudir = ../oldXMenu
 lwlibdir = ../lwlib
 lispdir = ../lisp
@@ -393,13 +394,16 @@
 
 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 \