X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=subdirmk%2Fgenerate;h=3b40ad0796304f18d66a005f7d2e347526a863aa;hb=fc1b687d7da6f195c60dac349183785cbead712e;hp=c431ec979b9009c227d44f81dc58045970720a02;hpb=3e6fcdbf631779df96ae72d8146248c1b9f0f4c0;p=subdirmk.git

diff --git a/subdirmk/generate b/subdirmk/generate
index c431ec9..3b40ad0 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;
@@ -52,7 +52,9 @@ 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;
@@ -62,6 +64,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,28 +104,39 @@ Makefile FORCE-ALWAYS-RUN:
 END
 }
 
-sub filter_subdir_mk ($$$$$) {
+sub process_input_mk ($$$$$$$$);
+sub process_input_mk ($$$$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-	$var_prefix, $targets) = @_;
+	$var_prefix, $targets,
+	$f, $esclitr, $enoent_ok) = @_;
 
-    #use Data::Dumper;
-    #print STDERR "filter @_\n";
+    my $caps_re = qr{[A-Z]};
+    my $lc_re = qr{[a-z]};
 
-    my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
-    my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
-    my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
-    my $esclit = '&';
-    my $esc = '\\&';
+    my $esc;
+    my $set_esc = sub {
+	$esc = $$esclitr;
+	$esc =~ s/\W/\\$&/g;
+    };
+    $set_esc->();
 
-    for my $f ($in, "${srcdir}/Perdir.mk.in") {
-      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;
+    }
+    $input_files{$f}++;
+
+    while (<$input>) {
+	if (s#^\s*$esc\:##) {
+	    $buffering_output='';
+	}
 	for (;;) {
 	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
 	    o $1;
-	    if ($2) { o $esclit; next; }
+	    if ($2) { o $$esclitr; next; }
 	    s{^$esc}{} or die "$_ ?";
-	    if (s{^$esc}{}) { o "$esclit$esclit" }
+	    if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
 	    elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
 		my $t = $1 // 'all';
 		o target_varname($var_prefix, $t);
@@ -148,16 +165,47 @@ sub filter_subdir_mk ($$$$$) {
 		o $_;
 		$_ = '';
 	    } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-		$esclit = $1;
-		$esc = $esclit;
-		$esc =~ s/\W/\\$&/g;
+		$$esclitr = $1;
+		$set_esc->();
+	    } else {
+		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, $subf);
+		o "\n";
 	    } else {
-		die "bad escape $esclit$_ ";
+		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 ($$$$$) {
+    my ($dir_prefix, $dir_suffix, $dir_name,
+	$var_prefix, $targets) = @_;
+
+    #use Data::Dumper;
+    #print STDERR "filter @_\n";
+
+    my $esclit = '&';
+
+    my $pi = sub {
+	my ($f, $enoentok) = @_;
+	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+			 $var_prefix, $targets,
+			 "${srcdir}/$f", \$esclit, $enoentok);
+    };
+    $pi->("${dir_prefix}Subdir.sd.mk", 0);
+    $pi->("Perdir.sd.mk",              1);
 }
 
 sub process_subtree ($$);
@@ -194,7 +242,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";
 	}
@@ -214,6 +262,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)";
 }