diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-07-10 19:33:39 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-07-10 19:33:39 +0000 |
| commit | 3bf7ce15d5b897724feb7f84f27fca2f8f5c4efe (patch) | |
| tree | 09dab2045aefc8103fdef7f423c8b67b4c11efbc /Projects/makefile | |
| parent | b2920402b4bdbb0523dcb5d8f89dd1c1f548b28b (diff) | |
| download | lufa-3bf7ce15d5b897724feb7f84f27fca2f8f5c4efe.tar.gz lufa-3bf7ce15d5b897724feb7f84f27fca2f8f5c4efe.tar.bz2 lufa-3bf7ce15d5b897724feb7f84f27fca2f8f5c4efe.zip | |
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.
Diffstat (limited to 'Projects/makefile')
| -rw-r--r-- | Projects/makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Projects/makefile b/Projects/makefile index ec8e65b8b..f4b411145 100644 --- a/Projects/makefile +++ b/Projects/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 |