diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-07-10 19:33:39 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-07-10 19:33:39 +0000 |
| commit | f4247bca22fd2af94101a5a1308309a606050e88 (patch) | |
| tree | 09dab2045aefc8103fdef7f423c8b67b4c11efbc /Demos/Device | |
| parent | 3afc3ce310a5b611b6264eec5d9361e73e49dfb1 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2393 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Device')
| -rw-r--r-- | Demos/Device/ClassDriver/makefile | 10 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/makefile | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Demos/Device/ClassDriver/makefile b/Demos/Device/ClassDriver/makefile index 3a5615e0..797a483f 100644 --- a/Demos/Device/ClassDriver/makefile +++ b/Demos/Device/ClassDriver/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 diff --git a/Demos/Device/LowLevel/makefile b/Demos/Device/LowLevel/makefile index 3a5615e0..797a483f 100644 --- a/Demos/Device/LowLevel/makefile +++ b/Demos/Device/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 |