X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=486bdc54e1c888b7be9cee539918296651cc8010;hp=0ad0eb8c930da8832fedaa6b9459cf4a19189b83;hb=6600b10418c5c38d43bf6c732724123ed34779b6;hpb=d0fbd0005b8f9ed1176c6378735f0d2c81720c82

diff --git a/subdirmk/generate b/subdirmk/generate
index 0ad0eb8..486bdc5 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -8,7 +8,7 @@
 #
 # generates in each subdirectory	from in each subdirectory
 #     Subdir.mk.tmp			    Subdir.sd.mk
-#     Makefile
+#     Makefile                          and included files
 # and in toplevel			and in toplevel
 #     main.mk.tmp			    Perdir.sd.mk
 
@@ -102,8 +102,9 @@ default: all
 %:	FORCE-ALWAYS-RUN
 	\@:
 Makefile FORCE-ALWAYS-RUN:
-	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(MAKECMDGOALS))
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:
+.PHONY:	FORCE-ALWAYS-RUN
 END
 }
 
@@ -164,6 +165,8 @@ sub process_input_mk ($$$$$$$$) {
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
 		o $_;
 		$_ = $after;
+	    } elsif (s{^\#}{}) {
+		$_ = '';
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
@@ -251,7 +254,7 @@ sub process_subtree ($$) {
 	}
 	print O "\n";
     }
-    
+
     return @targets;
 }