&:include feature

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index f353702fbb78a5277591bec73e505fbcf499afee..3208c8d9b333b0ec47355342c244fbd2ce994e5c 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -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,15 @@ 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;
+    }
+    while (<$input>) {
+       if (s#^\s*$esc\:##) {
+           $buffering_output='';
+       }
        for (;;) {
            unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
            o $1;
@@ -161,8 +168,23 @@ 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";
+               o "MAKEFILE_TEMPLATES += $subf\n";
+               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 ($$$$$) {
@@ -177,7 +199,7 @@ sub filter_subdir_mk ($$$$$) {
               "${srcdir}/Perdir.mk.in") {
        process_input_mk($dir_prefix, $dir_suffix, $dir_name,
                         $var_prefix, $targets,
-                        $f, \$esclit);
+                        $f, \$esclit, 0);
     }
 }