Merge branch 'master' of orgmode.org:org-mode

Makefile

@@ -32,6 +32,8 @@ help helpall::
 helpall::
 	$(info make test           - ditto)
 	$(info make compile-dirty  - build only stale Org ELisp files)
+	$(info make compile-single - build using one Emacs process per file)
+	$(info make compile-source - ditto, but immediately remove byte-compiled file )
 	$(info make test-dirty     - check without building first)
 	$(info )
 	$(info Compatibility)

default.mk

@@ -90,6 +90,10 @@ MAKE_ORG_VERSION = $(BATCHL) \
 ELCDIR	= $(BATCHL) \
 	  --eval '(batch-byte-recompile-directory 0)'
 
+# How to byte-compile a single file
+ELC	= $(BATCHL) \
+	  --eval '(batch-byte-compile)'
+
 # How to make a pdf file from a texinfo file
 TEXI2PDF = texi2pdf --batch --clean
 

lisp/Makefile

@@ -10,7 +10,7 @@ LISPA = $(LISPV) $(LISPI)
 LISPF = $(filter-out $(LISPA),$(wildcard *.el))
 LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc))
 
-.PHONY:	all compile compile-dirty \
+.PHONY:	all compile compile-dirty compile-single \
 		autoloads \
 		install clean cleanauto cleanall clean-install
 
@@ -18,6 +18,12 @@ LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc))
 all compile::	autoloads
 all compile compile-dirty::	 $(LISPI) $(LISPV)
 	$(ELCDIR)
+compile-single: clean autoloads $(LISPC)
+compile-source: clean autoloads
+	@$(foreach elc,$(LISPC),$(MAKE) $(elc) && $(RM) $(elc);)
+
+%.elc:	%.el
+	-$(ELC) $(<)
 
 autoloads:	cleanauto $(LISPI) $(LISPV)
 

targets.mk

@@ -28,7 +28,7 @@ endif
 	cleancontrib cleantesting cleanutils
 	cleanrel clean-install cleanelc cleandirs \
 	cleanlisp cleandoc cleandocs cleantest \
-	compile compile-dirty uncompiled \
+	compile compile-single compile-source compile-dirty uncompiled \
 	config config-test config-exe config-all config-eol
 
 CONF_BASE = EMACS DESTDIR
@@ -75,7 +75,7 @@ local.mk:
 
 all compile::
 	$(foreach dir, doc lisp, $(MAKE) -C $(dir) clean;)
-compile compile-dirty::
+compile compile-dirty compile-single compile-source::
 	$(MAKE) -C lisp $@
 all clean-install::
 	$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)