X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=f353702fbb78a5277591bec73e505fbcf499afee;hp=857e768cd494b317ba14b0f8851fbec11362c787;hb=f487d4baf3687bc013b5c38193002e6b8bc885e6;hpb=8d746a1d7b875ae2118247d08e944f2fd7700e8a

diff --git a/subdirmk/generate b/subdirmk/generate
index 857e768..f353702 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,22 +1,30 @@
 #!/usr/bin/perl -w
 #
-# $(srcdir)/build-aux/subdirmk-setup SUBDIR...
+# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
-# generates
-#   main.mk.tmp
-# and in each subdirectory
-#   Subdir.mk.tmp
-#   Makefile
+# generates in each subdirectory	from in each subdirectory
+#     Subdir.mk.tmp			    Subdir.mk.in
+#     Makefile
+# and in toplevel			and in toplevel
+#     main.mk.tmp			    Perdir.mk.in
 
 use strict;
+use POSIX;
 
-our $srcdir;
-our @subdirs = @ARGV;
+print "$0 @ARGV\n" or die $!;
+
+our $srcdir='.';
 
-die unless $ARGV[0] eq '--srcdir';
-die unless @ARGV>=2;
-shift @ARGV;
-($srcdir, @subdirs) = @ARGV;
+while (@ARGV && $ARGV[0] =~ m/^-/) {
+    $_ = shift @ARGV;
+    last if $_ eq '--';
+    if (s/^--srcdir=//) {
+	$srcdir=$';
+    } else {
+	die "$0: unknown option \`$_'\n";
+    }
+}
+our @subdirs = @ARGV;
 
 s{/+$}{} foreach @subdirs;
 
@@ -44,6 +52,7 @@ sub target_varname ($$) {
 }
 
 our $writing_output;
+our $buffering_output;
 our %output_files;
 
 sub close_any_output_file() {
@@ -54,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";
 }
@@ -90,32 +103,34 @@ 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) = @_;
-
-    #use Data::Dumper;
-    #print STDERR "filter @_\n";
+	$var_prefix, $targets,
+	$f, $esclitr) = @_;
 
-    my $in = "${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 = '\\&';
 
-    for my $f ($in, "Perdir.mk.in") {
-      open I, '<', $f or die "open $f: $!\n";
-      while (<I>) {
+    my $esc;
+    my $set_esc = sub {
+	$esc = $$esclitr;
+	$esc =~ s/\W/\\$&/g;
+    };
+    $set_esc->();
+
+    open I, '<', $f or die "open $f: $!\n";
+    while (<I>) {
 	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);
-		$targets->{$t}=1;
+		$targets->{$t} //= [ ];
 	    }
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
 	    elsif (m{^(?=$lc_re)}) { o $dir_prefix }
@@ -139,16 +154,30 @@ sub filter_subdir_mk ($$$$$) {
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
-	    } elsif (s{^!(\pPosixWord+|\pPosixPunct+)[ \t]*}{}) {
-		$esclit = $1;
-		$esc = $esclit;
-		$esc =~ s/\W/\\$&/g;
+	    } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
+		$$esclitr = $1;
+		$set_esc->();
 	    } else {
-		die "bad escape $esclit$_ ";
+		die "bad escape $$esclitr$_ ";
 	    }
 	}
-      }
-      I->error and die "read $f: $!\n";
+    }
+    I->error and die "read $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 = '&';
+    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
+	       "${srcdir}/Perdir.mk.in") {
+	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+			 $var_prefix, $targets,
+			 $f, \$esclit);
     }
 }
 
@@ -168,12 +197,12 @@ sub process_subtree ($$) {
 
     write_makefile($dir_prefix, scalar @$path);
 
-    my %targets = qw(all 1);
-    my @child_subdirs;
+    my %targets = (all => []);
     foreach my $child (@{ $node->[1] }) {
 	my @childpath = (@$path, $child->[0]);
-	push @child_subdirs, join '/', @childpath;
-	$targets{$_}++ foreach
+	my $child_subdir = join '/', @childpath;
+	mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!";
+	push @{ $targets{$_} }, $child_subdir foreach
 	    process_subtree($child, \@childpath);
     }
     start_output_file("${dir_prefix}Subdir.mk.tmp");
@@ -187,7 +216,7 @@ sub process_subtree ($$) {
     foreach my $target (@targets) {
 	my $target_varname = target_varname($var_prefix, $target);
 	print O "${dir_prefix}${target}: \$($target_varname)";
-	foreach my $child_subdir (@child_subdirs) {
+	foreach my $child_subdir (@{ $targets{$target} }) {
 	    print O " $child_subdir/$target";
 	}
 	print O "\n";