make TARGETS make :: rules

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index f353702fbb78a5277591bec73e505fbcf499afee..8abc04062bed2867e4025acf9eaed62f8b525059 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;
@@ -103,11 +103,11 @@ Makefile FORCE-ALWAYS-RUN:
 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,
-       $f, $esclitr) = @_;
+       $f, $esclitr, $enoent_ok) = @_;
 
     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
@@ -119,8 +119,17 @@ sub process_input_mk ($$$$$$$) {
     };
     $set_esc->();
 
-    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;
@@ -161,8 +170,22 @@ sub process_input_mk ($$$$$$$) {
                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 "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 ($$$$$) {
@@ -173,12 +196,15 @@ sub filter_subdir_mk ($$$$$) {
     #print STDERR "filter @_\n";
 
     my $esclit = '&';
-    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
-              "${srcdir}/Perdir.mk.in") {
+
+    my $pi = sub {
+       my ($f, $enoentok) = @_;
        process_input_mk($dir_prefix, $dir_suffix, $dir_name,
                         $var_prefix, $targets,
-                        $f, \$esclit);
-    }
+                        "${srcdir}/$f", \$esclit, $enoentok);
+    };
+    $pi->("${dir_prefix}Subdir.sd.mk", 0);
+    $pi->("Perdir.sd.mk",              1);
 }
 
 sub process_subtree ($$);
@@ -215,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";
        }