From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 30 Dec 2019 12:06:12 +0000 (+0000)
Subject: Merge subdirmk
X-Git-Tag: v0.6.0~250
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=24eb6b672f1095d5b362b6615f22c17f1136274a;hp=3a2c5e1f10dc6b3cc86f74c287d8c14be14d7e80;p=secnet.git

Merge subdirmk
---

diff --git a/subdirmk/README b/subdirmk/README
index 27dd855..fcf8c00 100644
--- a/subdirmk/README
+++ b/subdirmk/README
@@ -183,7 +183,7 @@ In more detail, with all the various options laid out:
              for      build     source       build         source
                                                        
   This       lc       &file     &^file       $(PWD)/&file  $(abs_src)/&file
-  directory  any      &/file    &^/file      $(PWD)&/file  $(abs_src)/&/file
+  directory  any      &/file    &^/file      $(PWD)/&file  $(abs_src)/&/file
              several  & f g h   &^ f g h     $(addprefix...)
                                              
   Top        lc       file      &~file
diff --git a/subdirmk/generate b/subdirmk/generate
index 32c6fbf..9275b25 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -258,6 +258,11 @@ sub process_subtree ($$) {
 	}
 	print O "\n";
     }
+    if (@targets) {
+	print O ".PHONY:";
+	print O " ${dir_prefix}${_}" foreach @targets;
+	print O "\n";
+    }
 
     return @targets;
 }
diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index c4002a6..5f24b08 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -44,10 +44,10 @@ main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
 # This filtering arranges that we can often run config.status to
 # generate only particular output files.  We look for *inputs* that
 # have changed.  If the only inputs that have changed are ones that we
-# know affect only one output (Subdir.mk.in and regen.mk.in), we pass
+# know affect only one output (Subdir.sd.mk and *.mk.in), we pass
 # config.status the corresponding output file names.  Otherwise we
 # pass nothing and config.status does them all.  We need to mention
-# regen.mk.in twice because if $(top_srcdir) is `.', make elides the
+# Subdir.sd.mk twice because if $(top_srcdir) is `.', make elides the
 # directory part from $?.
 	./$(CONFIG_STATUS) $(if					\
 		$(filter-out Subdir.sd.mk %/Subdir.sd.mk	\