[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ea8605a: Generate leim-list via lisp/Makefile, not
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master ea8605a: Generate leim-list via lisp/Makefile, not src/Makefile |
Date: |
Tue, 25 Apr 2017 19:39:48 -0400 (EDT) |
branch: master
commit ea8605ae84a14a0da55b55bff0e2ca8728d18efa
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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.
---
lisp/Makefile.in | 5 ++++-
src/Makefile.in | 5 +----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e13734a..0cb07b2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -184,6 +184,9 @@ $(lisp)/finder-inf.el:
# that all input files are generated before we create loaddefs.
# Otherwise making loaddefs again will change the output.
#
+# In fact, now we rely on this target to create leim-list.
+# In src, emacs depends directly on loaddefs.el (not leim-list).
+#
# Write to a temporary file in case we're doing a parallel build and a
# CANNOT_DUMP-mode Emacs needs to read loaddefs at startup.
#
@@ -196,7 +199,7 @@ $(lisp)/finder-inf.el:
# slow; starting from an almost-correct content will enable the "only
# update where necessary" feature of batch-update-autoloads.
autoloads .PHONY: $(lisp)/loaddefs.el
-$(lisp)/loaddefs.el: $(LOADDEFS)
+$(lisp)/loaddefs.el: gen-lisp $(LOADDEFS)
@echo Directories for loaddefs: ${SUBDIRS_ALMOST}
@if test -f $@ ; then cp $@ $(lisp)/loaddefs.tmp ; fi
$(AM_V_GEN)$(emacs) -l autoload \
diff --git a/src/Makefile.in b/src/Makefile.in
index 0b0d176..20f6eca 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -494,9 +494,6 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE)
$(LIBIMAGE) \
$(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \
$(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS)
-$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
- $(MAKE) -C ../leim all EMACS="$(bootstrap_exe)"
-
## FORCE it so that admin/unidata can decide whether these files
## are up-to-date. Although since charprop depends on bootstrap-emacs,
## and emacs (which recreates bootstrap-emacs) depends on charprop,
@@ -531,7 +528,7 @@ ${lispintdir}/characters.elc: ${charscript:.el=.elc}
## 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) \
- lisp.mk $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \
+ lisp.mk $(etc)/DOC $(lisp) \
$(lispsource)/international/charprop.el ${charsets}
ifeq ($(CANNOT_DUMP),yes)
ln -f temacs$(EXEEXT) $@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ea8605a: Generate leim-list via lisp/Makefile, not src/Makefile,
Glenn Morris <=