WIP attempt to run config.status with selective tags

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index 857e768cd494b317ba14b0f8851fbec11362c787..c431ec979b9009c227d44f81dc58045970720a02 100755 (executable)
--- 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;
 
@@ -97,13 +105,13 @@ sub filter_subdir_mk ($$$$$) {
     #use Data::Dumper;
     #print STDERR "filter @_\n";
 
-    my $in = "${dir_prefix}Subdir.mk.in";
+    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 = '\\&';
 
-    for my $f ($in, "Perdir.mk.in") {
+    for my $f ($in, "${srcdir}/Perdir.mk.in") {
       open I, '<', $f or die "open $f: $!\n";
       while (<I>) {
        for (;;) {
@@ -115,7 +123,7 @@ sub filter_subdir_mk ($$$$$) {
            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,7 +147,7 @@ sub filter_subdir_mk ($$$$$) {
            } elsif (s{^![ \t]+}{}) {
                o $_;
                $_ = '';
-           } elsif (s{^!(\pPosixWord+|\pPosixPunct+)[ \t]*}{}) {
+           } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
                $esclit = $1;
                $esc = $esclit;
                $esc =~ s/\W/\\$&/g;
@@ -168,12 +176,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 +195,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";