aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2018-12-04 21:31:54 +1100
committerDean Camera <dean@fourwalledcubicle.com>2018-12-04 21:37:16 +1100
commit550b42345a0235f3bc888778c6cc3a34f6a2919c (patch)
treea3165e8090607d6453cf9d876975032e3695264c /Projects
parent2fb7ccd4359b0cb9c6bc87404bd2ad10f13e03b3 (diff)
downloadlufa-550b42345a0235f3bc888778c6cc3a34f6a2919c.tar.gz
lufa-550b42345a0235f3bc888778c6cc3a34f6a2919c.tar.bz2
lufa-550b42345a0235f3bc888778c6cc3a34f6a2919c.zip
Don't build project folders in parallel.
Diffstat (limited to 'Projects')
-rw-r--r--Projects/XPLAINBridge/makefile2
-rw-r--r--Projects/makefile17
2 files changed, 4 insertions, 15 deletions
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index 92344e585..0bcf77729 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -36,7 +36,7 @@ all:
# identical OBJDIR directory, we need to enforce the use of this project's object file
# directory as the one where the build object files are to be stored, by giving it a
# path relative to the current folder.
-OBJDIR := ./obj
+OBJDIR := ./xpb-obj
# Include LUFA-specific DMBS extension modules
DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
diff --git a/Projects/makefile b/Projects/makefile
index 992dff860..3f5cd5719 100644
--- a/Projects/makefile
+++ b/Projects/makefile
@@ -22,20 +22,9 @@ ifeq ($(MAKELEVEL), 10)
$(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
endif
-# Need to special-case building without a per-project object directory
-ifeq ($(OBJDIR),)
- # If no target specified, force "clean all" and disallow parallel build
- ifeq ($(MAKECMDGOALS),)
- MAKECMDGOALS := clean all
- .NOTPARALLEL:
- endif
-
- # If one of the targets is to build, force "clean" beforehand and disallow parallel build
- ifneq ($(findstring all, $(MAKECMDGOALS)),)
- MAKECMDGOALS := clean $(MAKECMDGOALS)
- .NOTPARALLEL:
- endif
-endif
+# Build each directory sequentially, even if we are building using multiple
+# cores within each project
+.NOTPARALLEL:
%: $(PROJECT_DIRECTORIES)
@echo . > /dev/null