X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=aae2e481e5992fb0068ef1ff2b71a10af75c17e7;hp=7b8727b1988c254968889387fb5c402a8f7965b6;hb=416eb8d3aa0554fa9d7ee44e86d16a2be9761711;hpb=6e55ff3751f385c20194a313a2e939f2a1af2677

diff --git a/subdirmk/generate b/subdirmk/generate
index 7b8727b..aae2e48 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -3,10 +3,10 @@
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # generates in each subdirectory	from in each subdirectory
-#     Subdir.mk.tmp			    Subdir.mk.in
+#     Subdir.mk.tmp			    Subdir.sd.mk
 #     Makefile
 # and in toplevel			and in toplevel
-#     main.mk.tmp			    Perdir.mk.in
+#     main.mk.tmp			    Perdir.sd.mk
 
 use strict;
 use POSIX;
@@ -54,6 +54,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,11 +95,10 @@ 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},\$(MAKECMDGOALS))
 .SUFFIXES:
 END
 }
@@ -109,8 +109,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,7 +124,12 @@ sub process_input_mk ($$$$$$$$) {
 	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
 	return;
     }
+    $input_files{$f}++;
+
     while (<$input>) {
+	if (s#^\s*$esc\:##) {
+	    $buffering_output='';
+	}
 	for (;;) {
 	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
 	    o $1;
@@ -165,6 +170,19 @@ sub process_input_mk ($$$$$$$$) {
 		die "bad escape $$esclitr$_ ";
 	    }
 	}
+	if (defined $buffering_output) {
+	    $_=$buffering_output;
+	    $buffering_output=undef;
+	    if (m#^(-?)include\s+(\S+)\s+$#) {
+		my $subf = "$srcdir/$2";
+		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+				 $var_prefix, $targets,
+				 $subf, $esclitr, $1);
+		o "\n";
+	    } else {
+		die "unknown directive $_ ";
+	    }
+	}
     }
     $input->error and die "read $f: $!\n";
     close $input or die "close $f: $!\n";
@@ -178,12 +196,15 @@ sub filter_subdir_mk ($$$$$) {
     #print STDERR "filter @_\n";
 
     my $esclit = '&';
-    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
-	       "${srcdir}/Perdir.mk.in") {
+
+    my $pi = sub {
+	my ($f, $enoentok) = @_;
 	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 			 $var_prefix, $targets,
-			 $f, \$esclit, 0);
-    }
+			 "${srcdir}/$f", \$esclit, $enoentok);
+    };
+    $pi->("${dir_prefix}Subdir.sd.mk", 0);
+    $pi->("Perdir.sd.mk",              1);
 }
 
 sub process_subtree ($$);
@@ -220,7 +241,7 @@ 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";
 	}
@@ -240,6 +261,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)";
 }