X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=generate;h=ca54f944d13cf5011df25c77e4ca86f3c5af5821;hb=61f8c1504443809e6a86217bc8f35ba9c1b7ab5f;hp=9275b25770b818e8346a6c11b0ba532c9e2e4de7;hpb=2a8a5a4b83fa745c7016a68dad7722aed4709705;p=subdirmk.git

diff --git a/generate b/generate
index 9275b25..ca54f94 100755
--- a/generate
+++ b/generate
@@ -32,8 +32,8 @@ our @subdirs = @ARGV;
 
 s{/+$}{} foreach @subdirs;
 
-our $root = [ '.', [ ] ];
-# each node is [ 'relative subdir name', \@children ]
+our $root = [ '.', [ ], 1 ];
+# each node is [ 'relative subdir name', \@children, $mentioned ]
 
 sub build_tree () {
     foreach my $subdir (@subdirs) {
@@ -47,6 +47,7 @@ sub build_tree () {
 	    }
 	    $node = $c;
 	}
+	$node->[2] = 1;
     }
 }
 
@@ -59,6 +60,7 @@ our $writing_output;
 our $buffering_output;
 our %output_files;
 our %input_files;
+our @output_makefiles;
 
 sub close_any_output_file() {
     return unless defined $writing_output;
@@ -112,10 +114,10 @@ Makefile run-main.mk:
 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,
+	$var_prefix, $var_prefix_name, $targets,
 	$f, $esclitr, $enoent_ok) = @_;
 
     my $caps_re = qr{[A-Z]};
@@ -174,9 +176,6 @@ sub process_input_mk ($$$$$$$$) {
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
-	    } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-		$$esclitr = $1;
-		$set_esc->();
 	    } else {
 		die "bad escape $$esclitr$_ ";
 	    }
@@ -187,9 +186,12 @@ sub process_input_mk ($$$$$$$$) {
 	    if (m#^(-?)include\s+(\S+)\s+$#) {
 		my $subf = "$srcdir/$2";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-				 $var_prefix, $targets,
+				 $var_prefix, $var_prefix_name, $targets,
 				 $subf, $esclitr, $1);
 		o "\n";
+	    } elsif (m#^changequote\s+(\S+)\s+$#) {
+		$$esclitr = $1;
+		$set_esc->();
 	    } else {
 		die "unknown directive $_ ";
 	    }
@@ -199,9 +201,9 @@ sub process_input_mk ($$$$$$$$) {
     close $input or die "close $f: $!\n";
 }
 
-sub filter_subdir_mk ($$$$$) {
+sub filter_subdir_mk ($$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-	$var_prefix, $targets) = @_;
+	$var_prefix, $var_prefix_name, $targets) = @_;
 
     #use Data::Dumper;
     #print STDERR "filter @_\n";
@@ -211,7 +213,7 @@ sub filter_subdir_mk ($$$$$) {
     my $pi = sub {
 	my ($f, $enoentok) = @_;
 	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-			 $var_prefix, $targets,
+			 $var_prefix, $var_prefix_name, $targets,
 			 "${srcdir}/$f", \$esclit, $enoentok);
     };
     $pi->("${dir_prefix}Subdir.sd.mk", 0);
@@ -230,8 +232,10 @@ sub process_subtree ($$) {
     my $dir_prefix = join '', map { "$_/" } @$path;
     my $dir_suffix = join '', map { "/$_" } @$path;
     my $dir_name = join '/', @$path ? @$path : '.';
-    my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
+    my $var_prefix_name = join '_', @$path ? @$path : qw(TOP);
+    my $var_prefix = "${var_prefix_name}_";
 
+    push @output_makefiles, "${dir_prefix}Subdir.mk";
     write_makefile($dir_prefix, scalar @$path);
 
     my %targets = (all => []);
@@ -244,8 +248,18 @@ sub process_subtree ($$) {
     }
     start_output_file("${dir_prefix}Subdir.mk.tmp");
 
-    filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
-		     $var_prefix, \%targets);
+    if ($node->[2]) {
+	filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
+			 $var_prefix, $var_prefix_name, \%targets);
+    } else {
+	my $sdmk = "${dir_prefix}Subdir.sd.mk";
+	if (stat $sdmk) {
+	    die "$sdmk unexpectedly exists (${dir_prefix} not mentioned)";
+	} elsif ($!==ENOENT) {
+	} else {
+	    die "stat $sdmk: $!";
+	}
+    }
 
     o "\n";
 
@@ -275,14 +289,13 @@ sub process_tree() {
     }
     o "SUBDIRMK_MAKEFILES :=\n";
     o "MAKEFILE_TEMPLATES :=\n";
-    o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
-    foreach my $subdir (@subdirs) {
-	o "SUBDIRMK_MAKEFILES += $subdir/Subdir.mk\n";
+    foreach my $mf (@output_makefiles) {
+	o "SUBDIRMK_MAKEFILES += $mf\n";
     }
     foreach my $input (sort keys %input_files) {
 	o "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(SUBDIRMK_MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)\n";
 }
 
 build_tree();