From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Dec 2019 15:17:12 +0000 (+0000)
Subject: subdirmk: break out subdirmk_target in generated Makefile
X-Git-Tag: v0.6.0~251^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e149e53837aae5e1cfb39b44bb0a00ea8b185016;hp=-c;p=secnet.git

subdirmk: break out subdirmk_target in generated Makefile

We are going to want to reuse this.  Make it a simply-expanded make
variable rather than a perl variable, so that it only gets computed
once.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

e149e53837aae5e1cfb39b44bb0a00ea8b185016
diff --git a/generate b/generate
index 87e2214..22e8aff 100755
--- a/generate
+++ b/generate
@@ -101,8 +101,9 @@ sub write_makefile ($$) {
 default: all
 \$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
 	\@:
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
 Makefile run-main.mk:
-	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))
 .SUFFIXES:
 .PHONY:	run-main.mk
 END