aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2017-04-25 19:30:31 -0400
committerGlenn Morris2017-04-25 19:30:31 -0400
commitea8605ae84a14a0da55b55bff0e2ca8728d18efa (patch)
tree380896f634886f9ef6d23f3397ae57c13d08d16a /src
parentf0424b131583e92939d2c3591e3c2f56d8e547aa (diff)
downloademacs-ea8605ae84a14a0da55b55bff0e2ca8728d18efa.tar.gz
emacs-ea8605ae84a14a0da55b55bff0e2ca8728d18efa.zip
Generate leim-list via lisp/Makefile, not src/Makefile
* src/Makefile.in ($(leimdir)/leim-list.el): Remove rule. (emacs$(EXEEXT)): Don't depend on leim-list. * lisp/Makefile.in ($(lisp)/loaddefs.el): Depend on gen-lisp again.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 0b0d1768b5c..20f6ecad113 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -494,9 +494,6 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
494 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \ 494 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \
495 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) 495 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS)
496 496
497$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
498 $(MAKE) -C ../leim all EMACS="$(bootstrap_exe)"
499
500## FORCE it so that admin/unidata can decide whether these files 497## FORCE it so that admin/unidata can decide whether these files
501## are up-to-date. Although since charprop depends on bootstrap-emacs, 498## are up-to-date. Although since charprop depends on bootstrap-emacs,
502## and emacs (which recreates bootstrap-emacs) depends on charprop, 499## and emacs (which recreates bootstrap-emacs) depends on charprop,
@@ -531,7 +528,7 @@ ${lispintdir}/characters.elc: ${charscript:.el=.elc}
531## since not all pieces are used on all platforms. But DOC depends 528## since not all pieces are used on all platforms. But DOC depends
532## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. 529## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
533emacs$(EXEEXT): temacs$(EXEEXT) \ 530emacs$(EXEEXT): temacs$(EXEEXT) \
534 lisp.mk $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \ 531 lisp.mk $(etc)/DOC $(lisp) \
535 $(lispsource)/international/charprop.el ${charsets} 532 $(lispsource)/international/charprop.el ${charsets}
536ifeq ($(CANNOT_DUMP),yes) 533ifeq ($(CANNOT_DUMP),yes)
537 ln -f temacs$(EXEEXT) $@ 534 ln -f temacs$(EXEEXT) $@