X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=8a5daa6b0fc6269cfc6c2cba935b957a0c62e8e2;hp=56bfe549e570aa6a402eb638ad3ee10bab1834b7;hb=51d204f72e2c292c0c6751109e54c4546d1ab41f;hpb=922857ccd6eb85a801154d2edc48eee7b929e13d

diff --git a/subdirmk/generate b/subdirmk/generate
index 56bfe54..8a5daa6 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,12 +1,16 @@
 #!/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.mk.in
-#     Makefile
+#     Subdir.mk.tmp			    Subdir.sd.mk
+#     Makefile                          and included files
 # and in toplevel			and in toplevel
-#     main.mk.tmp			    Perdir.mk.in
+#     main.mk.tmp			    Perdir.sd.mk
 
 use strict;
 use POSIX;
@@ -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
 }
 
@@ -109,8 +114,8 @@ sub process_input_mk ($$$$$$$$) {
 	$var_prefix, $targets,
 	$f, $esclitr, $enoent_ok) = @_;
 
-    my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
-    my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
+    my $caps_re = qr{[A-Z]};
+    my $lc_re = qr{[a-z]};
 
     my $esc;
     my $set_esc = sub {
@@ -124,6 +129,8 @@ sub process_input_mk ($$$$$$$$) {
 	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
 	return;
     }
+    $input_files{$f}++;
+
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $buffering_output='';
@@ -173,10 +180,9 @@ sub process_input_mk ($$$$$$$$) {
 	    $buffering_output=undef;
 	    if (m#^(-?)include\s+(\S+)\s+$#) {
 		my $subf = "$srcdir/$2";
-		o "MAKEFILE_TEMPLATES += $subf\n";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 				 $var_prefix, $targets,
-				 $subf, $esclitr, $subf);
+				 $subf, $esclitr, $1);
 		o "\n";
 	    } else {
 		die "unknown directive $_ ";
@@ -200,12 +206,10 @@ sub filter_subdir_mk ($$$$$) {
 	my ($f, $enoentok) = @_;
 	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 			 $var_prefix, $targets,
-			 $f, \$esclit, $enoentok);
+			 "${srcdir}/$f", \$esclit, $enoentok);
     };
-    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
-	       "${srcdir}/Perdir.mk.in") {
-	$pi->($f, 0);
-    }
+    $pi->("${dir_prefix}Subdir.sd.mk", 0);
+    $pi->("Perdir.sd.mk",              1);
 }
 
 sub process_subtree ($$);
@@ -242,13 +246,13 @@ sub process_subtree ($$) {
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
 	my $target_varname = target_varname($var_prefix, $target);
-	print O "${dir_prefix}${target}: \$($target_varname)";
+	print O "${dir_prefix}${target}:: \$($target_varname)";
 	foreach my $child_subdir (@{ $targets{$target} }) {
 	    print O " $child_subdir/$target";
 	}
 	print O "\n";
     }
-    
+
     return @targets;
 }
 
@@ -262,6 +266,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)";
 }