From 21dba5b36439b493652f7ac7d5a7d2d713ad9947 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 1 Jun 2022 13:10:30 +0200 Subject: [PATCH] Start the org -> texi conversion while doing byte compilation * lisp/Makefile.in (MAIN_FIRST): Compile stuff needed for org -> texi generation. (all): Add org-manuals. (org-manuals): Start org -> texi conversion while we're doing byte compilation to make things more parallel. This shaves off about ten seconds of a "make -j8" build. --- lisp/Makefile.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 5f9ca016948..f1ca92ab9a1 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -95,10 +95,13 @@ COMPILE_FIRST += $(lisp)/emacs-lisp/radix-tree.elc # Files to compile early in compile-main. Works around bug#25556. # Also compile the ja-dic file used to convert the Japanese dictionary -# to speed things up. +# to speed things up. The org files are used to convert org files to +# texi files. MAIN_FIRST = ./emacs-lisp/eieio.el ./emacs-lisp/eieio-base.el \ ./cedet/semantic/db.el ./emacs-lisp/cconv.el \ - ./international/ja-dic-cnv.el + ./international/ja-dic-cnv.el \ + ./org/ox.el ./org/ox-texinfo.el ./org/org-macro.el ./org/org-element.el \ + ./org/oc.el ./org/ol.el ./emacs-lisp/cl-lib.el # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH @@ -121,11 +124,12 @@ 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 generate-ja-dic +all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el generate-ja-dic \ + org-manuals PHONY_EXTRAS = .PHONY: all custom-deps finder-data autoloads update-subdirs $(PHONY_EXTRAS) \ - generate-ja-dic + generate-ja-dic org-manuals # custom-deps and finder-data both used to scan _all_ the *.el files. # This could lead to problems in parallel builds if automatically @@ -161,6 +165,9 @@ generate-ja-dic: main-first $(AM_V_at)$(MAKE) -C ../leim generate-ja-dic EMACS="$(EMACS)" $(AM_V_at)$(MAKE) compile-targets TARGETS="./leim/ja-dic/ja-dic.elc" +org-manuals: main-first + $(AM_V_at)$(MAKE) -C ../doc/misc org.texi modus-themes.texi + ## Comments on loaddefs generation: # loaddefs depends on gen-lisp for two reasons: -- 2.39.2