From 245a0a81abcd4706fef7d034eb0bb69af79ec595 Mon Sep 17 00:00:00 2001
From: Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>
Date: Tue, 10 Jul 2012 18:30:41 +0000
Subject: Slightly better method of recursive make - use proper make
 dependencies to allow for parallel builds.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2391 d5102386-fcda-11dd-9fdb-3debd5008f28
---
 Demos/Device/ClassDriver/makefile   | 21 +++++++++++++++++----
 Demos/Device/LowLevel/makefile      | 21 +++++++++++++++++----
 Demos/DualRole/ClassDriver/makefile | 20 ++++++++++++++++----
 Demos/Host/ClassDriver/makefile     | 21 +++++++++++++++++----
 Demos/Host/LowLevel/makefile        | 21 +++++++++++++++++----
 5 files changed, 84 insertions(+), 20 deletions(-)

(limited to 'Demos')

diff --git a/Demos/Device/ClassDriver/makefile b/Demos/Device/ClassDriver/makefile
index ad880009..3a5615e0 100644
--- a/Demos/Device/ClassDriver/makefile
+++ b/Demos/Device/ClassDriver/makefile
@@ -22,10 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
+# If building without a per-project object directory, we can't build in parallel
 ifeq ($(OBJDIR),)
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;)
+   .NOTPARALLEL:
+
+   # 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
 
-%:
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)
+%: $(PROJECT_DIRECTORIES)
+	@echo . > /dev/null
+
+$(PROJECT_DIRECTORIES):
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)
diff --git a/Demos/Device/LowLevel/makefile b/Demos/Device/LowLevel/makefile
index ad880009..3a5615e0 100644
--- a/Demos/Device/LowLevel/makefile
+++ b/Demos/Device/LowLevel/makefile
@@ -22,10 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
+# If building without a per-project object directory, we can't build in parallel
 ifeq ($(OBJDIR),)
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;)
+   .NOTPARALLEL:
+
+   # 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
 
-%:
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)
+%: $(PROJECT_DIRECTORIES)
+	@echo . > /dev/null
+
+$(PROJECT_DIRECTORIES):
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)
diff --git a/Demos/DualRole/ClassDriver/makefile b/Demos/DualRole/ClassDriver/makefile
index 741383f1..71fb805e 100644
--- a/Demos/DualRole/ClassDriver/makefile
+++ b/Demos/DualRole/ClassDriver/makefile
@@ -22,11 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
+# If building without a per-project object directory, we can't build in parallel
 ifeq ($(OBJDIR),)
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;)
+   .NOTPARALLEL:
+
+   # 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
 
-%:
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)
+%: $(PROJECT_DIRECTORIES)
+	@echo . > /dev/null
 
+$(PROJECT_DIRECTORIES):
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)
diff --git a/Demos/Host/ClassDriver/makefile b/Demos/Host/ClassDriver/makefile
index d9a3dc35..a2b14c8a 100644
--- a/Demos/Host/ClassDriver/makefile
+++ b/Demos/Host/ClassDriver/makefile
@@ -22,10 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
+# If building without a per-project object directory, we can't build in parallel
 ifeq ($(OBJDIR),)
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;)
+   .NOTPARALLEL:
+
+   # 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
 
-%:
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)
+%: $(PROJECT_DIRECTORIES)
+	@echo . > /dev/null
+
+$(PROJECT_DIRECTORIES):
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)
diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile
index d9a3dc35..a2b14c8a 100644
--- a/Demos/Host/LowLevel/makefile
+++ b/Demos/Host/LowLevel/makefile
@@ -22,10 +22,23 @@ ifeq ($(MAKELEVEL), 10)
    $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif
 
-all:
+# If building without a per-project object directory, we can't build in parallel
 ifeq ($(OBJDIR),)
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) clean all;)
+   .NOTPARALLEL:
+
+   # 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
 
-%:
-	@$(foreach PROJECT, $(PROJECT_DIRECTORIES), $(MAKE) -C $(PROJECT) $@;)
+%: $(PROJECT_DIRECTORIES)
+	@echo . > /dev/null
+
+$(PROJECT_DIRECTORIES):
+	@$(MAKE) -C $@ $(MAKECMDGOALS)
+    
+.PHONY: $(PROJECT_DIRECTORIES)
-- 
cgit v1.2.3