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

diff --git a/subdirmk/generate b/subdirmk/generate
index 6ce18f9..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
 
@@ -54,6 +58,7 @@ sub target_varname ($$) {
 our $writing_output;
 our $buffering_output;
 our %output_files;
+our %input_files;
 
 sub close_any_output_file() {
     return unless defined $writing_output;
@@ -94,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
 }
 
@@ -124,7 +129,7 @@ sub process_input_mk ($$$$$$$$) {
 	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
 	return;
     }
-    o "MAKEFILE_TEMPLATES += $f\n";
+    $input_files{$f}++;
 
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
@@ -160,6 +165,8 @@ sub process_input_mk ($$$$$$$$) {
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
 		o $_;
 		$_ = $after;
+	    } elsif (s{^\#}{}) {
+		$_ = '';
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
@@ -177,7 +184,7 @@ sub process_input_mk ($$$$$$$$) {
 		my $subf = "$srcdir/$2";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 				 $var_prefix, $targets,
-				 $subf, $esclitr, $subf);
+				 $subf, $esclitr, $1);
 		o "\n";
 	    } else {
 		die "unknown directive $_ ";
@@ -247,7 +254,7 @@ sub process_subtree ($$) {
 	}
 	print O "\n";
     }
-    
+
     return @targets;
 }
 
@@ -261,6 +268,9 @@ sub process_tree() {
     foreach my $subdir (@subdirs) {
 	o "MAKEFILES += $subdir/Subdir.mk\n";
     }
+    foreach my $input (sort keys %input_files) {
+	o "MAKEFILE_TEMPLATES += $input\n";
+    }
     o "include \$(MAKEFILES)";
 }