Re: Reworking loaddefs.el generation

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> So we'd need to rearrange those to be compiled first, and then
> have that target depend on that new target?  Perhaps put them in
> MAIN_FIRST in lisp/Makefile, and...  er...  something.

Perhaps something along the lines of:

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index d9c5173c07..a0788580b7 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -71,8 +71,8 @@ INFO_COMMON =
        dbus dired-x ebrowse ede ediff edt eieio \
        emacs-mime epa erc ert eshell eudc efaq eww \
        flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
-       mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode \
-       org pcl-cvs pgg rcirc remember reftex sasl \
+       mairix-el message mh-e newsticker nxml-mode octave-mode \
+       pcl-cvs pgg rcirc remember reftex sasl \
        sc semantic ses sieve smtpmail speedbar srecode todo-mode transient \
        tramp url vhdl-mode vip viper vtable widget wisent woman
 
@@ -82,7 +82,7 @@ INFO_INSTALL =
 ## Info files to build on current platform.
 ## This is all of them, even though they might not all get installed,
 ## because the info files are pre-built in release tarfiles.
-INFO_TARGETS = $(INFO_COMMON) efaq-w32
+INFO_TARGETS = $(INFO_COMMON) efaq-w32 org modus-themes
 
 ## Some manuals have their source in .org format.
 ## This is discouraged because the .texi files it generates
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 5f9ca01694..4e3219bcef 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -98,7 +98,9 @@ COMPILE_FIRST +=
 # to speed things up.
 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 +123,12 @@ SUBDIRS_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 +164,9 @@ generate-ja-dic:
        $(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
+       $(MAKE) -C ../doc/misc org.texi modus-themes.texi
+
 ## Comments on loaddefs generation:
 
 # loaddefs depends on gen-lisp for two reasons:


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no