From 3bf7ce15d5b897724feb7f84f27fca2f8f5c4efe Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 10 Jul 2012 19:33:39 +0000 Subject: Fix up makefile .NOTPARALLEL heuristics so that linear building is only enforced if no object folder set and the "all" target is run. Rename library "ConfigDescriptor.c" file to "ConfigDescriptors.c" to ensure that object filenames are unique. --- Demos/Host/LowLevel/makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Demos/Host/LowLevel') diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile index a2b14c8a6..d057a1c69 100644 --- a/Demos/Host/LowLevel/makefile +++ b/Demos/Host/LowLevel/makefile @@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10) $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED) endif -# If building without a per-project object directory, we can't build in parallel +# Need to special-case building without a per-project object directory ifeq ($(OBJDIR),) - .NOTPARALLEL: - - # Ensure projects are pre-cleaned if the target is the default or "all" + # 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 -- cgit v1.2.3