X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=55323d2770aec5d0ecfa2a96a132acaeaa1eb7cf;hp=110f8f1a6e8fcba53ccefe3ef7838a805d8d0c55;hb=b1f14d76cfc604fedd57499c6d8ce44a91391067;hpb=af70b0f3abfb813c198e80bcd69323fff8b5b96f

diff --git a/subdirmk/generate b/subdirmk/generate
index 110f8f1..55323d2 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -52,6 +52,7 @@ sub target_varname ($$) {
 }
 
 our $writing_output;
+our $buffering_output;
 our %output_files;
 
 sub close_any_output_file() {
@@ -62,6 +63,10 @@ sub close_any_output_file() {
 }
 
 sub o {
+    if (defined $buffering_output) {
+	$buffering_output .= $_ foreach @_;
+	return;
+    }
     die unless defined $writing_output;
     print O @_ or die "error writing $writing_output.tmp: $!\n";
 }
@@ -98,11 +103,11 @@ Makefile FORCE-ALWAYS-RUN:
 END
 }
 
-sub process_input_mk ($$$$$$$);
-sub process_input_mk ($$$$$$$) {
+sub process_input_mk ($$$$$$$$);
+sub process_input_mk ($$$$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
 	$var_prefix, $targets,
-	$f, $esclitr) = @_;
+	$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)};
@@ -114,8 +119,15 @@ sub process_input_mk ($$$$$$$) {
     };
     $set_esc->();
 
-    open I, '<', $f or die "open $f: $!\n";
-    while (<I>) {
+    my $input = new IO::File $f, '<';
+    if (!$input) {
+	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
+	return;
+    }
+    while (<$input>) {
+	if (s#^\s*$esc\:##) {
+	    $buffering_output='';
+	}
 	for (;;) {
 	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
 	    o $1;
@@ -156,8 +168,23 @@ 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";
+		o "MAKEFILE_TEMPLATES += $subf\n";
+		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+				 $var_prefix, $targets,
+				 $subf, $esclitr, $subf);
+		o "\n";
+	    } else {
+		die "unknown directive $_ ";
+	    }
+	}
     }
-    I->error and die "read $f: $!\n";
+    $input->error and die "read $f: $!\n";
+    close $input or die "close $f: $!\n";
 }
 
 sub filter_subdir_mk ($$$$$) {
@@ -168,12 +195,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);
-    }
+			 "${srcdir}/$f", \$esclit, $enoentok);
+    };
+    $pi->("${dir_prefix}Subdir.mk.in", 0);
+    $pi->("Perdir.mk.in",              1);
 }
 
 sub process_subtree ($$);