features.in/Makefile: cosmetic rewrite

The outmost shell loop got replaced with a (hidden) bunch of targets -- it's somewhat controversial as the inner loops are still there (but at least don't wrap around my SXGA+). Full targetization might be beneficial in terms of parallelism achievable *but* that would ruin git history being generated, and building a distro configuration takes a few seconds at most. (upon reading http://stackoverflow.com/questions/5414418/)

features.in/Makefile: cosmetic rewrite
ed0842b7 · Michael Shigorin · 390f4f6b · ed0842b7
Commit ed0842b7 authored Dec 06, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 78 additions and 67 deletions

Makefile features.in/Makefile +78 -67

No files found.
--- a/features.in/Makefile
+++ b/features.in/Makefile
@@ -25,88 +25,99 @@ include $(BUILDDIR)/distcfg.mk
 #     still both pieces go into a single destination

 ### sorry for somewhat complicated and overly long lines
-all:
+
+TARGETS := prep $(FEATURES) finalize
+
+.PHONY: $(TARGETS)
+all:  | $(TARGETS)
+
+prep:
 	@echo "** starting feature configuration"
 	@if [ -n "$(GLOBAL_DEBUG)" ]; then \
 		echo "** target subprofiles: $(SUBPROFILES)"; \
 		echo "** requested features: $(FEATURES)"; \
 	fi
-	@for feat in $(FEATURES); do \
-		if [ -n "$(GLOBAL_DEBUG)" ]; then \
-			echo "** adding $$feat feature"; \
-		fi; \
-		pushd "$$feat" >/dev/null && \
-		for sub in / $(SUBPROFILES); do \
-			dirtags=; \
-			if [ "$$sub" = / ]; then \
-				parts=lib; \
-				srcdirs="."; \
-				dst="."; \
-			else \
-				parts=; \
-				src="$${sub%/*}"; \
-				dst="$${sub#*/}"; \
-				srcdirs=; \
-				if [ -d "$$src" ]; then \
-					srcdirs="$$src"; \
-					dirtags="&& $$src"; \
-				fi; \
-				if [ -d "$$dst" -a "$$dst" != "$$src" ]; then \
-					srcdirs="$$srcdirs $$dst"; \
-					dirtags="&& ($$src || $$dst)"; \
-				fi; \
-				for srcdir in $$srcdirs; do \
-					rsync -qab --exclude tagged \
-						"$$srcdir/" "$(BUILDDIR)/$$dst/"; \
-				done; \
+
+# feat
+$(FEATURES):
+	@feat=$@; \
+	if [ -n "$(GLOBAL_DEBUG)" ]; then \
+		echo "** adding $$feat feature"; \
+	fi; \
+	pushd "$$feat" >/dev/null && \
+	for sub in / $(SUBPROFILES); do \
+		dirtags=; \
+		if [ "$$sub" = / ]; then \
+			parts=lib; \
+			srcdirs="."; \
+			dst="."; \
+		else \
+			parts=; \
+			src="$${sub%/*}"; \
+			dst="$${sub#*/}"; \
+			srcdirs=; \
+			if [ -d "$$src" ]; then \
+				srcdirs="$$src"; \
+				dirtags="&& $$src"; \
 			fi; \
-			if [ -n "$(GLOBAL_DEBUG)" ]; then \
-				echo "** src=[$$src] dst=[$$dst] srcdirs=[$$srcdirs]"; \
+			if [ -d "$$dst" -a "$$dst" != "$$src" ]; then \
+				srcdirs="$$srcdirs $$dst"; \
+				dirtags="&& ($$src || $$dst)"; \
 			fi; \
 			for srcdir in $$srcdirs; do \
-				[ -d "$$srcdir" ] || continue; \
-				pushd "$$srcdir" >&/dev/null; \
-				for part in $$parts {image-,}scripts.d; do \
-					destdir="$(BUILDDIR)/$$dst/$$part"; \
-					[ -d "$$destdir" ] || continue; \
-					if [ "$$sub" = / -a -d "$$part" ]; then \
-						rsync -qab "$$part/" "$$destdir/"; \
-					fi; \
-					[ -d "tagged/$$part" ] || continue; \
-					[ "$$srcdir" != "." ] || continue; \
-					pushd "tagged/$$part" >/dev/null; \
-					echo "$$feat $$dirtags" \
-					| tags2lists . \
-					| xargs -r cp -vpLt "$$destdir" --; \
-					popd >/dev/null; \
-				done; \
-				popd >&/dev/null; \
+				rsync -qab --exclude tagged \
+					"$$srcdir/" "$(BUILDDIR)/$$dst/"; \
 			done; \
-			if type -t git >&/dev/null && \
-			   pushd "$(BUILDDIR)/$$dst/" >/dev/null; then \
-				test -n "`git status -s`" && \
-				git add . && \
-				if [ -n "$$dst" ]; then \
-					the="$$sub subprofile"; \
-				else \
-					the="toplevel"; \
-				fi && \
-				git commit -qam "$$feat feature: $$the part added"; \
+		fi; \
+		if [ -n "$(GLOBAL_DEBUG)" ]; then \
+			echo "** src=[$$src] dst=[$$dst] srcdirs=[$$srcdirs]"; \
+		fi; \
+		for srcdir in $$srcdirs; do \
+			[ -d "$$srcdir" ] || continue; \
+			pushd "$$srcdir" >&/dev/null; \
+			for part in $$parts {image-,}scripts.d; do \
+				destdir="$(BUILDDIR)/$$dst/$$part"; \
+				[ -d "$$destdir" ] || continue; \
+				if [ "$$sub" = / -a -d "$$part" ]; then \
+					rsync -qab "$$part/" "$$destdir/"; \
+				fi; \
+				[ -d "tagged/$$part" ] || continue; \
+				[ "$$srcdir" != "." ] || continue; \
+				pushd "tagged/$$part" >/dev/null; \
+				echo "$$feat $$dirtags" \
+				| tags2lists . \
+				| xargs -r cp -vpLt "$$destdir" --; \
 				popd >/dev/null; \
-			fi; \
+			done; \
+			popd >&/dev/null; \
 		done; \
-		if [ -x "generate.sh" ]; then sh generate.sh; fi; \
-		if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \
 		if type -t git >&/dev/null && \
-		   pushd "$(BUILDDIR)/" >/dev/null; then \
-			if test -n "`git status -s`"; then \
-				git add . && \
-				git commit -qam "$$feat feature generation complete"; \
-			fi; \
+		   pushd "$(BUILDDIR)/$$dst/" >/dev/null; then \
+			test -n "`git status -s`" && \
+			git add . && \
+			if [ -n "$$dst" ]; then \
+				the="$$sub subprofile"; \
+			else \
+				the="toplevel"; \
+			fi && \
+			git commit -qam "$$feat feature: $$the part added"; \
 			popd >/dev/null; \
 		fi; \
+	done; \
+	if [ -x "generate.sh" ]; then sh generate.sh; fi; \
+	if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \
+	if type -t git >&/dev/null && \
+	   pushd "$(BUILDDIR)/" >/dev/null; then \
+		if test -n "`git status -s`"; then \
+			git add . && \
+			git commit -qam "$$feat feature generation complete"; \
+		fi; \
 		popd >/dev/null; \
-	done
+	fi; \
+	popd >/dev/null
+
+finalize:
 	@find "$(BUILDDIR)/" -name '*~' \
 	| sed "s,$(BUILDDIR)/,** warning: file clash: ," >&2
+
 endif