X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/1a5559aff221c699efb799c14955d9adccb99794..4782bcca1b8384b95c5ab84e36110ad2ffdba4dc:/Makefile

diff --git a/Makefile b/Makefile
index 8f918e5..1c48383 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,8 @@ TARGETS			 = $(addsuffix .sh,$(HOSTS))
 
 TARGETS			+= dummy.sh
 dummy.sh: base.m4 prologue.m4 dummy-payload.m4
-	$(V_M4) $^ >$@.new && chmod +x $@.new && mv $@.new $@
+	$(V_M4)-DFWHOST=testing $^ >$@.new
+	$(V_AT)chmod +x $@.new && mv $@.new $@
 
 TARGETS			+= dummy-inst.sh
 dummy-inst.sh: dummy.sh
@@ -110,16 +111,26 @@ dummy-inst.sh: dummy.sh
 	$(V_AT)chmod +x $@.new && mv $@.new $@
 
 ###--------------------------------------------------------------------------
+### Other utilities.
+
+## A list of diversions in ascending numerical order.
+CLEANFILES		+= divs
+divs: $(M4_SOURCES) $(addsuffix .m4,$(HOSTS))
+	$(V_GEN)grep -n m4_divert $^ | \
+		grep -v 'm4_divert(-1)' | \
+		sort -t\( -k2n >$@
+
+###--------------------------------------------------------------------------
 ### Building.
 
 all: $(TARGETS)
 .PHONY: all
 
 %.sh: %.m4 $(M4_SOURCES)
-	$(V_M4)base.m4 $*.m4 $(MAIN_M4_SOURCES) >$@.new
+	$(V_M4)-DFWHOST=$* base.m4 $*.m4 $(MAIN_M4_SOURCES) >$@.new
 	$(V_AT)chmod +x $@.new && mv $@.new $@
 
-clean:; rm -f $(TARGETS) *.new
+clean:; rm -f $(TARGETS) *.new $(CLEANFILES)
 .PHONY: clean
 
 ###--------------------------------------------------------------------------
@@ -154,7 +165,7 @@ $(addprefix install/, $(OTHERHOSTS)): install/%: %.sh
 	$(ROOT) ssh root@$* rm -f $(FIREWALL).new
 
 ## General installation target.
-install: all install/$(THISHOST) $(addprefix install/,$(HOSTS))
+install: all $(addprefix install/,$(HOSTS))
 .PHONY: install $(addprefix install/,$(HOSTS))
 
 ###----- That's all, folks --------------------------------------------------