do not demand \W after CAPS and lc

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index c431ec979b9009c227d44f81dc58045970720a02..6ce18f96d88d55535f830126662e1751536a0aa6 100755 (executable)
--- 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,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,28 +103,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;
+    }
+    o "MAKEFILE_TEMPLATES += $f\n";
+
+    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 +164,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 +241,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";
        }