From 77403e376a430a0b05afa5506d1dca18b66021b5 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Thu, 20 Jun 2024 18:01:52 +0200 Subject: [PATCH] Revert "mk: Allow parallel execution" This reverts commit 71fbe92c2e320363871af38774163358528cca6f. Parallel make still does not work. --- lisp/Makefile | 13 +++++++------ mk/targets.mk | 7 ++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lisp/Makefile b/lisp/Makefile index c570d9cfa..c57095f65 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -1,3 +1,4 @@ +.NOTPARALLEL: # always run this make serially .SUFFIXES: # we don't need default suffix rules ifeq ($(MAKELEVEL), 0) $(error This make needs to be started as a sub-make from the toplevel directory.) @@ -19,7 +20,7 @@ _ORGCM_ := dirall single native source slint1 slint2 install clean cleanauto cleanall cleanelc clean-install # do not clean here, done in toplevel make -all compile compile-dirty:: | autoloads +all compile compile-dirty:: autoloads ifeq ($(filter-out $(_ORGCM_),$(ORGCM)),) $(MAKE) compile-$(ORGCM) else @@ -27,11 +28,11 @@ else endif compile-dirall: dirall -compile-single: $(LISPC) | single -compile-native: $(LISPN) | native -compile-source: | source dirall -compile-slint1: | dirall slint1 -compile-slint2: | source dirall slint1 +compile-single: single $(LISPC) +compile-native: native $(LISPN) +compile-source: source dirall +compile-slint1: dirall slint1 +compile-slint2: source dirall slint1 # internal dirall: diff --git a/mk/targets.mk b/mk/targets.mk index 00be37dc2..684d7f26e 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -1,4 +1,5 @@ .EXPORT_ALL_VARIABLES: +.NOTPARALLEL: .PHONY # Additional distribution files DISTFILES_extra= Makefile etc @@ -66,9 +67,9 @@ config config-test config-exe config-all config-version:: @echo "" 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 -update update2:: | up0 clean autoloads all +update update2:: up0 clean autoloads all single: ORGCM=single single: compile @@ -127,7 +128,7 @@ $(INSTSUB): autoloads: lisp $(MAKE) -C $< $@ -repro: | cleanall autoloads +repro: cleanall autoloads -@$(REPRO) & cleandirs: