Reshuffle the generation of the OKURO-NASI entries to speed up build

* leim/Makefile.in (all): Remove the ja-dic target from all -- we
don't need this file generated before we generate the .elc files.
(generate-ja-dic): Add new target.

* lisp/Makefile.in (.PHONY, generate-ja-dic): Add new target.
(all): Make all depend on the new generate-ja-dic target so that
the OKURO-NASI entries are computed while the .elc files are
compiled.  On a AMD Ryzen 9 5950X 16-Core Processor this brings
compilation time on a "make -j32 bootstrap" down from 1m52s to 1m34s.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 4e70e8b7e9d1f1c034a131b3f6e7dd2e6c35c570..3b4216c0b822681d1c6a1c24ebb7392caaaa8ad4 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -80,7 +80,7 @@ MISC= \
 TIT_MISC = ${TIT_GB} ${TIT_BIG5} ${MISC}
 
 
-all: ${leimdir}/leim-list.el ${leimdir}/ja-dic/ja-dic.el
+all: ${leimdir}/leim-list.el
 .PHONY: all
 
 
@@ -129,6 +129,8 @@ ${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC}
 
 ${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic
 
+.PHONY: generate-ja-dic
+generate-ja-dic: ${leimdir}/ja-dic/ja-dic.el
 ${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
        $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \
          --eval "(setq max-specpdl-size 5000)" \

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e3e6c41fecf4e92c0a4a16602202cda130b7e6b4..ada791751ff3a922dd6e6ffda7370d1d0e253901 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -118,10 +118,11 @@ SUBDIRS_SUBDIRS = $(filter-out ${srcdir}/cedet% ${srcdir}/leim%,${SUBDIRS})
 
 # cus-load and finder-inf are not explicitly requested by anything, so
 # we add them here to make sure they get built.
-all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
+all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el generate-ja-dic
 
 PHONY_EXTRAS =
-.PHONY: all custom-deps finder-data autoloads update-subdirs $(PHONY_EXTRAS)
+.PHONY: all custom-deps finder-data autoloads update-subdirs $(PHONY_EXTRAS) \
+       generate-ja-dic
 
 # custom-deps and finder-data both used to scan _all_ the *.el files.
 # This could lead to problems in parallel builds if automatically
@@ -152,6 +153,9 @@ $(lisp)/finder-inf.el:
          --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \
          -f finder-compile-keywords-make-dist ${SUBDIRS_FINDER}
 
+generate-ja-dic:
+       $(MAKE) -C ../leim generate-ja-dic EMACS="$(EMACS)"
+
 ## Comments on loaddefs generation:
 
 # loaddefs depends on gen-lisp for two reasons: