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

diff --git a/subdirmk/generate b/subdirmk/generate
index 8a2c986..486bdc5 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,10 +1,14 @@
 #!/usr/bin/perl -w
 #
+# subdirmk - &-filter (makefile generation program)
+#  Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
+#
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # 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
 
@@ -95,12 +99,12 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-	\@: \$@
 %:	FORCE-ALWAYS-RUN
-	\$(MAKE) -C $cd -f main.mk ${dir_prefix}\$@
+	\@:
 Makefile FORCE-ALWAYS-RUN:
-	\@: \$@
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:
+.PHONY:	FORCE-ALWAYS-RUN
 END
 }
 
@@ -161,6 +165,8 @@ sub process_input_mk ($$$$$$$$) {
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
 		o $_;
 		$_ = $after;
+	    } elsif (s{^\#}{}) {
+		$_ = '';
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
@@ -248,7 +254,7 @@ sub process_subtree ($$) {
 	}
 	print O "\n";
     }
-    
+
     return @targets;
 }