mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 04:27:48 +00:00
mk: Allow parallel execution
* lisp/Makefile (.NOTPARALLEL): Do not suppress parallel execution. (all compile compile-dirty): (compile-single): (compile-native): (compile-source): (compile-slint1): (compile-slint2): Explicitly declare prerequisites that must be run sequentially. * mk/targets.mk (.NOTPARALLEL): Do not suppress parallel execution. (uncompiled): (update update2): (repro): Explicitly declare prerequisites that must be run sequentially.
This commit is contained in:
parent
ecb5b605d7
commit
71fbe92c2e
|
@ -1,4 +1,3 @@
|
||||||
.NOTPARALLEL: # always run this make serially
|
|
||||||
.SUFFIXES: # we don't need default suffix rules
|
.SUFFIXES: # we don't need default suffix rules
|
||||||
ifeq ($(MAKELEVEL), 0)
|
ifeq ($(MAKELEVEL), 0)
|
||||||
$(error This make needs to be started as a sub-make from the toplevel directory.)
|
$(error This make needs to be started as a sub-make from the toplevel directory.)
|
||||||
|
@ -20,7 +19,7 @@ _ORGCM_ := dirall single native source slint1 slint2
|
||||||
install clean cleanauto cleanall cleanelc clean-install
|
install clean cleanauto cleanall cleanelc clean-install
|
||||||
|
|
||||||
# do not clean here, done in toplevel make
|
# do not clean here, done in toplevel make
|
||||||
all compile compile-dirty:: autoloads
|
all compile compile-dirty:: | autoloads
|
||||||
ifeq ($(filter-out $(_ORGCM_),$(ORGCM)),)
|
ifeq ($(filter-out $(_ORGCM_),$(ORGCM)),)
|
||||||
$(MAKE) compile-$(ORGCM)
|
$(MAKE) compile-$(ORGCM)
|
||||||
else
|
else
|
||||||
|
@ -28,11 +27,11 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
compile-dirall: dirall
|
compile-dirall: dirall
|
||||||
compile-single: single $(LISPC)
|
compile-single: $(LISPC) | single
|
||||||
compile-native: native $(LISPN)
|
compile-native: $(LISPN) | native
|
||||||
compile-source: source dirall
|
compile-source: | source dirall
|
||||||
compile-slint1: dirall slint1
|
compile-slint1: | dirall slint1
|
||||||
compile-slint2: source dirall slint1
|
compile-slint2: | source dirall slint1
|
||||||
|
|
||||||
# internal
|
# internal
|
||||||
dirall:
|
dirall:
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
.EXPORT_ALL_VARIABLES:
|
.EXPORT_ALL_VARIABLES:
|
||||||
.NOTPARALLEL: .PHONY
|
|
||||||
# Additional distribution files
|
# Additional distribution files
|
||||||
DISTFILES_extra= Makefile etc
|
DISTFILES_extra= Makefile etc
|
||||||
|
|
||||||
|
@ -67,9 +66,9 @@ config config-test config-exe config-all config-version::
|
||||||
@echo ""
|
@echo ""
|
||||||
|
|
||||||
oldorg: compile info # what the old makefile did when no target was specified
|
oldorg: compile info # what the old makefile did when no target was specified
|
||||||
uncompiled: cleanlisp autoloads # for developing
|
uncompiled: | cleanlisp autoloads # for developing
|
||||||
refcard: card
|
refcard: card
|
||||||
update update2:: up0 all
|
update update2:: | up0 all
|
||||||
|
|
||||||
single: ORGCM=single
|
single: ORGCM=single
|
||||||
single: compile
|
single: compile
|
||||||
|
@ -129,7 +128,7 @@ $(INSTSUB):
|
||||||
autoloads: lisp
|
autoloads: lisp
|
||||||
$(MAKE) -C $< $@
|
$(MAKE) -C $< $@
|
||||||
|
|
||||||
repro: cleanall autoloads
|
repro: | cleanall autoloads
|
||||||
-@$(REPRO) &
|
-@$(REPRO) &
|
||||||
|
|
||||||
cleandirs:
|
cleandirs:
|
||||||
|
|
Loading…
Reference in a new issue