Update Makefiles

Makefile

@@ -6,15 +6,20 @@ ROOTPATH     := /opt/build/PresenceDetection
 COMMANDLINE  := $(shell ps -o args= $$PPID)
 
 ARCHS        := $(shell ls $(ROOTPATH)/Makefile.conf.* | grep -v base | sed 's/.*Makefile\.conf\.//g')
+ARCHS        += any
 ARCH         := $(filter $(ARCHS),$(MAKECMDGOALS))
+MAKECMDGOALS := $(filter-out $(ARCH),$(MAKECMDGOALS))
+ARCHS        := $(filter-out any,$(ARCHS))
 
 ifeq ($(ARCH),)
 ARCH         := x86-64
 endif
 
 ifeq (,$(findstring -S,$(COMMANDLINE)))
+ifneq ($(ARCH),)
 $(info ARCH: $(ARCH))
 endif
+endif
 
 -include $(ROOTPATH)/Makefile.conf.$(ARCH)
 -include $(ROOTPATH)/Makefile.conf.base
@@ -44,7 +49,7 @@ OBJECTS       = $(SOURCES:.cpp=.o.$(ARCH))
 DEPENDS       = $(OBJECTS:.o.$(ARCH)=.d.$(ARCH))
 TARGETS       =
 
-define target
+define build_target_arch
 	$(eval $@_DATETIME := $(DATETIME))
 	@echo -n " [LD] $(1)\n"
 	@$(PREFIX) $(CC) -o $(1) $(2) $(LFLAGS) $(CFLAGS) $(POSTFIX)
@@ -54,6 +59,18 @@ define target
 	@chmod -x $(DEBUGDIR)/$(1)-$($@_DATETIME).debug
 endef
 
+define build_target
+	@if [ "$(ARCH)" = "any" ]; then \
+		for arch in $(ARCHS); do \
+			echo "ARCH: $$arch"; \
+			$(MAKE) -s -S $(1) $$arch; \
+		done; \
+		true; \
+	else \
+		$(MAKE) -s -S $(1).$(ARCH) $(ARCH); \
+	fi
+endef
+
 $(LOCALOBJECTS): | $(SUBDIRS)
 $(OBJECTS): | $(SUBDIRS)
 
@@ -68,14 +85,16 @@ ifneq ($(MAKECMDGOALS),clean)
 endif
 
 %.d.$(ARCH): %.cpp
-	@depth=$(MAKELEVEL); \
+	@if [ "$(ARCH)" != "any" ]; then \
+		depth=$(MAKELEVEL); \
 		while [ $${depth} -gt 0 ] ; do \
 			echo -n " "; \
 			depth=`expr $$depth - 1`; \
 		done; \
-	true
+		true; \
-	@echo -n " [MM] $@\n"
+		echo -n " [MM] $@\n"; \
-	@$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX)
+		$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
+	fi
 
 %.o.$(ARCH): %.cpp
 	@depth=$(MAKELEVEL); \
@@ -88,14 +107,16 @@ endif
 	@$(PREFIX) $(CC) -c $(CFLAGS) $< -o $@ $(POSTFIX)
 
 %.d.$(ARCH): %.cc
-	@depth=$(MAKELEVEL); \
+	@if [ "$(ARCH)" != "any" ]; then \
+		depth=$(MAKELEVEL); \
 		while [ $${depth} -gt 0 ] ; do \
 			echo -n " "; \
 			depth=`expr $$depth - 1`; \
 		done; \
-	true
+		true; \
-	@echo -n " [MM] $@\n"
+		echo -n " [MM] $@\n"; \
-	@$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX)
+		$(PREFIX) $(CC) $(CFLAGS) $< -MM -MT $(@:.d.$(ARCH)=.o.$(ARCH)) >$@ $(POSTFIX); \
+	fi
 
 %.o.$(ARCH): %.cc
 	@depth=$(MAKELEVEL); \
@@ -140,7 +161,14 @@ all: $(TARGETS)
 
 .PHONY: clean
 clean:
-	@for dir in $(SUBDIRS); do \
+	@if [ "$(ARCH)" = "any" ]; then \
+		for arch in $(ARCHS); do \
+			echo "ARCH: $$arch"; \
+			$(MAKE) -s -S $(MAKECMDGOALS) $$arch; \
+		done; \
+		true; \
+	else \
+		for dir in $(SUBDIRS); do \
 			depth=$(MAKELEVEL); \
 			while [ $${depth} -gt 0 ] ; do \
 				echo -n " "; \
@@ -154,12 +182,23 @@ clean:
 			done; \
 			echo " </$$dir>"; \
 		done; \
-	true
+		for target in $(TARGETS); do \
-	@rm -f $(LOCALOBJECTS) $(LOCALDEPENDS) $(ARNAME) $(TARGETS) || true
+			rm -f $$target.$(ARCH); \
+		done; \
+		true; \
+	fi
+	@rm -f $(LOCALOBJECTS) $(LOCALDEPENDS) $(ARNAME) || true
 
 .PHONY: cleandeps
 cleandeps:
-	@for dir in $(SUBDIRS); do \
+	@if [ "$(ARCH)" = "any" ]; then \
+		for arch in $(ARCHS); do \
+			echo "ARCH: $$arch"; \
+			$(MAKE) -s -S $(MAKECMDGOALS) $$arch; \
+		done; \
+		true; \
+	else \
+		for dir in $(SUBDIRS); do \
 			depth=$(MAKELEVEL); \
 			while [ $${depth} -gt 0 ] ; do \
 				echo -n " "; \
@@ -173,31 +212,23 @@ cleandeps:
 			done; \
 			echo " </$$dir>"; \
 		done; \
-	true
+		for target in $(TARGETS); do \
-	@rm -f $(LOCALDEPENDS) $(TARGETS) || true
+			rm -f $$target.$(ARCH); \
-
-.PHONY: cleanall
-cleanall:
-	@for dir in $(SUBDIRS); do \
-		depth=$(MAKELEVEL); \
-		while [ $${depth} -gt 0 ] ; do \
-			echo -n " "; \
-			depth=`expr $$depth - 1`; \
 		done; \
-		echo " <$$dir>"; \
+		true; \
-		$(MAKE) -s -S -C $$dir $@ $(ARCH); \
+	fi
-		while [ $${depth} -gt 0 ] ; do \
+	@rm -f $(LOCALDEPENDS) || true
-			echo -n " "; \
-			depth=`expr $$depth - 1`; \
-		done; \
-		echo " </$$dir>"; \
-	done; \
-	true
-	@rm -f *.d.* *.o.*
-	@rm -f $(ARNAME) $(TARGETS) || true
 
 .PHONY: $(ARCH)
 $(ARCH):
-	@if [ "$(words $(MAKECMDGOALS))" = "1" ]; then \
+	@if [ "$(words $(MAKECMDGOALS))" = "0" ]; then \
+		if [ "$(ARCH)" = "any" ]; then \
+			for arch in $(ARCHS); do \
+				echo "ARCH: $$arch"; \
+				$(MAKE) -s -S $(.DEFAULT_GOAL) $$arch; \
+			done; \
+			true; \
+		else \
 			$(MAKE) -s -S $(.DEFAULT_GOAL) $(ARCH); \
+		fi \
 	fi

Makefile.target

@@ -3,15 +3,17 @@
 #
 
 PresenceDetection.$(ARCH): $(OBJECTS) Application/PresenceDetection.o.$(ARCH)
-	$(call target,$@,$^)
+	$(call build_target_arch,$@,$^)
 
 test.$(ARCH): $(OBJECTS) Application/Test.o.$(ARCH)
-	$(call target,$@,$^)
+	$(call build_target_arch,$@,$^)
 
-PresenceDetection: PresenceDetection.$(ARCH)
+PresenceDetection:
-test: test.$(ARCH)
+	$(call build_target,$@)
+
+test:
+	$(call build_target,$@)
 
 .DEFAULT_GOAL := PresenceDetection
 
 TARGETS += PresenceDetection test
-