diff options
| author | Glenn Morris | 2017-04-25 19:30:31 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-04-25 19:30:31 -0400 |
| commit | ea8605ae84a14a0da55b55bff0e2ca8728d18efa (patch) | |
| tree | 380896f634886f9ef6d23f3397ae57c13d08d16a /lisp | |
| parent | f0424b131583e92939d2c3591e3c2f56d8e547aa (diff) | |
| download | emacs-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 'lisp')
| -rw-r--r-- | lisp/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index e13734a5035..0cb07b2d35a 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -184,6 +184,9 @@ $(lisp)/finder-inf.el: | |||
| 184 | # that all input files are generated before we create loaddefs. | 184 | # that all input files are generated before we create loaddefs. |
| 185 | # Otherwise making loaddefs again will change the output. | 185 | # Otherwise making loaddefs again will change the output. |
| 186 | # | 186 | # |
| 187 | # In fact, now we rely on this target to create leim-list. | ||
| 188 | # In src, emacs depends directly on loaddefs.el (not leim-list). | ||
| 189 | # | ||
| 187 | # Write to a temporary file in case we're doing a parallel build and a | 190 | # Write to a temporary file in case we're doing a parallel build and a |
| 188 | # CANNOT_DUMP-mode Emacs needs to read loaddefs at startup. | 191 | # CANNOT_DUMP-mode Emacs needs to read loaddefs at startup. |
| 189 | # | 192 | # |
| @@ -196,7 +199,7 @@ $(lisp)/finder-inf.el: | |||
| 196 | # slow; starting from an almost-correct content will enable the "only | 199 | # slow; starting from an almost-correct content will enable the "only |
| 197 | # update where necessary" feature of batch-update-autoloads. | 200 | # update where necessary" feature of batch-update-autoloads. |
| 198 | autoloads .PHONY: $(lisp)/loaddefs.el | 201 | autoloads .PHONY: $(lisp)/loaddefs.el |
| 199 | $(lisp)/loaddefs.el: $(LOADDEFS) | 202 | $(lisp)/loaddefs.el: gen-lisp $(LOADDEFS) |
| 200 | @echo Directories for loaddefs: ${SUBDIRS_ALMOST} | 203 | @echo Directories for loaddefs: ${SUBDIRS_ALMOST} |
| 201 | @if test -f $@ ; then cp $@ $(lisp)/loaddefs.tmp ; fi | 204 | @if test -f $@ ; then cp $@ $(lisp)/loaddefs.tmp ; fi |
| 202 | $(AM_V_GEN)$(emacs) -l autoload \ | 205 | $(AM_V_GEN)$(emacs) -l autoload \ |