Add check and error to the BUILD module if OBJDIR option is set but object filenames...

[pub/USBasp.git] / Demos / DualRole / ClassDriver / makefile

diff --git a/Demos/DualRole/ClassDriver/makefile b/Demos/DualRole/ClassDriver/makefile
index ecc49ec..71fb805 100644 (file)
--- a/Demos/DualRole/ClassDriver/makefile
+++ b/Demos/DualRole/ClassDriver/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,9 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
-       @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) clean all;)
+# If building without a per-project object directory, we can't build in parallel
+ifeq ($(OBJDIR),)
+   .NOTPARALLEL:
 
-%:
-       @$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -s -C $(PROJECT) $@;)
+   # Ensure projects are pre-cleaned if the target is the default or "all"
+   ifeq ($(MAKECMDGOALS),)
+      MAKECMDGOALS := clean all
+   endif
+   ifneq ($(findstring all, $(MAKECMDGOALS)),)
+      MAKECMDGOALS := clean $(MAKECMDGOALS)
+   endif
+endif
+
+%: $(PROJECT_DIRECTORIES)
+       @echo . > /dev/null
 
+$(PROJECT_DIRECTORIES):
+       @$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)