X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7f29c468d7bfce620f49ba1c0898bc68e95597f3..bcc45e24aa6cac11ca93c1b2ccafa795aa2e3eb2:/Projects/makefile diff --git a/Projects/makefile b/Projects/makefile index ec8e65b8b..dd0ea2e8f 100644 --- a/Projects/makefile +++ b/Projects/makefile @@ -13,7 +13,7 @@ # custom LUFA library build options are reflected in the compiled # code. -PROJECT_DIRECTORIES = $(shell ls -d */) +PROJECT_DIRECTORIES := $(shell ls -d */) # This makefile is potentially infinitely recursive if something really bad # happens when determining the set of project directories - hard-abort if @@ -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