diff options
author | Bastien Guerry <bzg@altern.org> | 2012-08-15 00:10:13 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-15 00:10:13 +0200 |
commit | 32e3257c2d74de7287eb35d3fbd0e4e80543e5f7 (patch) | |
tree | 38f47bc1da2cfe0426df95e9fb1e70fdb06374cd | |
parent | b57a91f8dd41bff16f91d69b276880c3a1db5dd9 (diff) | |
download | org-mode-32e3257c2d74de7287eb35d3fbd0e4e80543e5f7.tar.gz |
Revert "Makefile: add elint to compilation methods, ensure *.elc files exist after compilation"
This reverts commit 1e47e65e977e0f704feed505595ff87da0369350.
-rw-r--r-- | default.mk | 17 | ||||
-rw-r--r-- | lisp/Makefile | 31 | ||||
-rw-r--r-- | targets.mk | 2 |
3 files changed, 13 insertions, 37 deletions
@@ -73,10 +73,6 @@ MAKE_LOCAL_MK = $(BATCH) \ # Emacs must be started in lisp directory BATCHL = $(BATCH) \ --eval '(add-to-list '"'"'load-path ".")' -ELINTL = $(BATCHL) \ - --eval '(load "elint")' -ELINTF = --eval '(elint-initialize t)' \ - --eval '(elint-file "./$$(el)")' # How to generate org-install.el MAKE_ORG_INSTALL = $(BATCHL) \ @@ -136,12 +132,9 @@ SUDO = sudo # INSTALL_INFO = ginstall-info # Debian: avoid harmless warning message INSTALL_INFO = install-info -# target method for 'compile' +# target variant for 'compile' +# _COMPILE_ = single # one Emacs process per compilation +# _COMPILE_ = source # ditto, but remove compiled file immediately +# _COMPILE_ = slint1 # possibly elicit more warnings +# _COMPILE_ = slint2 # possibly elicit even more warnings _COMPILE_ = dirall -# (w/ slowdown compared to default variant) -# _COMPILE_ = single # 4x one Emacs process per compilation -# _COMPILE_ = source # 5x ditto, but remove compiled file immediately -# _COMPILE_ = slint1 # 3x possibly elicit more warnings -# _COMPILE_ = slint2 # 7x possibly elicit even more warnings -# _COMPILE_ = slint3 # 25x run elint in a single Emacs process -# _COMPILE_ = slint4 # 275x run elint in one Emacs process per source file diff --git a/lisp/Makefile b/lisp/Makefile index 4047b42..c547810 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -11,9 +11,7 @@ LISPF = $(filter-out $(LISPA),$(sort $(wildcard *.el))) LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc)) .PHONY: all compile compile-dirty \ - dirall source slint1 slint3 slint4 \ - compile-single compile-source \ - compile-slint1 compile-slint2 compile-slint3 compile-slint4 \ + compile-single compile-source compile-slint1 compile-slint2 \ autoloads \ install clean cleanauto cleanall cleanelc clean-install @@ -21,30 +19,15 @@ LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc)) all compile compile-dirty:: autoloads $(MAKE) compile-$(_COMPILE_) -compile-dirall: dirall -compile-single: $(LISPC) -compile-source: source dirall -compile-slint1: dirall slint1 -compile-slint2: source dirall slint1 -compile-slint3: slint3 dirall -compile-slint4: slint4 dirall - -# internal -dirall: - @$(info ==================== $@ ====================) +compile-dirall: @$(ELCDIR) -source: cleanelc - @$(info ==================== $@ ====================) +compile-single: $(LISPC) +compile-source: cleanelc @$(foreach elc,$(LISPC),$(MAKE) $(elc) && $(RM) $(elc);) -slint1: - @$(info ==================== $@ ====================) +compile-slint1: compile-dirall @$(foreach elc,$(LISPC),$(RM) $(elc); $(MAKE) $(elc);) -slint3: - @$(info ==================== $@ ====================) - -@$(ELINTL) $(foreach el,$(LISPF),$(ELINTF)) -slint4: - @$(info ==================== $@ ====================) - -@$(foreach el,$(LISPF),$(ELINTL) $(ELINTF);) +compile-slint2: + $(MAKE) compile-source compile-slint1 %.elc: %.el @$(info Compiling single $(abspath $<)...) @@ -35,7 +35,7 @@ CONF_BASE = EMACS DESTDIR CONF_DEST = lispdir infodir datadir testdir CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA CONF_EXEC = CP MKDIR RM RMR FIND SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO -CONF_CALL = BATCH BATCHL ELCDIR ELINTL ELINTF BTEST MAKE_LOCAL_MK MAKE_ORG_INSTALL MAKE_ORG_VERSION +CONF_CALL = BATCH BATCHL ELCDIR BTEST MAKE_LOCAL_MK MAKE_ORG_INSTALL MAKE_ORG_VERSION config-eol:: EOL = \# config-eol:: config-all config config-all:: |