fix toplevel arch/distro loops

There was a somewhat subtle Makefile->main.mk rename leftover lurking in "everything" target: the default Makefile got used, not the supposed main.mk -- which resulted in an attempt to get way too much job done (the number of builds per target became $ARCH squared, not just $ARCH). Huge thanks to led@ for being an inspiring pedantic!

fix toplevel arch/distro loops
9304c12c · Michael Shigorin · b95caa9b · 9304c12c · 9304c12c
Commit 9304c12c authored Jan 17, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

Makefile Makefile +2 -0

main.mk main.mk +2 -5

No files found.
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@ export NUM_TARGETS := $(words $(MAKECMDGOALS))
 		echo "** goal: $@ [$$n/$(NUM_TARGETS)]"; \
 	fi; \
 	for ARCH in $(ARCHES); do \
+		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then echo; fi; \
+		echo "** ARCH: $$ARCH"; \
 		$(MAKE) -f main.mk ARCH=$$ARCH $@; \
 	done; \
 	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then echo; fi
--- a/main.mk
+++ b/main.mk
@@ -61,11 +61,8 @@ everything:
 	@n=1; sum=$(words $(DISTROS)); \
 	for distro in $(DISTROS); do \
 		echo "** building $$distro [$$n/$$sum]:"; \
-		$(MAKE) --no-print-directory \
+		$(MAKE) -f main.mk --no-print-directory $$distro; \
-			COUNT=$$n/$$sum \
+		[ "$$n" -lt "$$sum" ] && echo; \
-			BUILDDIR=$(BUILDDIR) \
-			$$distro; \
-		echo; \
 		n=$$(($$n+1)); \
 	done