generate: Provide $var_prefix_name to process_input_mk

[subdirmk.git] / generate

diff --git a/generate b/generate
index 14deda4e281dc35c42272019a76af253bec22b3e..ca54f944d13cf5011df25c77e4ca86f3c5af5821 100755 (executable)
--- a/generate
+++ b/generate
@@ -60,6 +60,7 @@ our $writing_output;
 our $buffering_output;
 our %output_files;
 our %input_files;
+our @output_makefiles;
 
 sub close_any_output_file() {
     return unless defined $writing_output;
@@ -113,10 +114,10 @@ Makefile run-main.mk:
 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,
+       $var_prefix, $var_prefix_name, $targets,
        $f, $esclitr, $enoent_ok) = @_;
 
     my $caps_re = qr{[A-Z]};
@@ -175,9 +176,6 @@ sub process_input_mk ($$$$$$$$) {
            } elsif (s{^![ \t]+}{}) {
                o $_;
                $_ = '';
-           } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-               $$esclitr = $1;
-               $set_esc->();
            } else {
                die "bad escape $$esclitr$_ ";
            }
@@ -188,9 +186,12 @@ sub process_input_mk ($$$$$$$$) {
            if (m#^(-?)include\s+(\S+)\s+$#) {
                my $subf = "$srcdir/$2";
                process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-                                $var_prefix, $targets,
+                                $var_prefix, $var_prefix_name, $targets,
                                 $subf, $esclitr, $1);
                o "\n";
+           } elsif (m#^changequote\s+(\S+)\s+$#) {
+               $$esclitr = $1;
+               $set_esc->();
            } else {
                die "unknown directive $_ ";
            }
@@ -200,9 +201,9 @@ sub process_input_mk ($$$$$$$$) {
     close $input or die "close $f: $!\n";
 }
 
-sub filter_subdir_mk ($$$$$) {
+sub filter_subdir_mk ($$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-       $var_prefix, $targets) = @_;
+       $var_prefix, $var_prefix_name, $targets) = @_;
 
     #use Data::Dumper;
     #print STDERR "filter @_\n";
@@ -212,7 +213,7 @@ sub filter_subdir_mk ($$$$$) {
     my $pi = sub {
        my ($f, $enoentok) = @_;
        process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-                        $var_prefix, $targets,
+                        $var_prefix, $var_prefix_name, $targets,
                         "${srcdir}/$f", \$esclit, $enoentok);
     };
     $pi->("${dir_prefix}Subdir.sd.mk", 0);
@@ -231,8 +232,10 @@ sub process_subtree ($$) {
     my $dir_prefix = join '', map { "$_/" } @$path;
     my $dir_suffix = join '', map { "/$_" } @$path;
     my $dir_name = join '/', @$path ? @$path : '.';
-    my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
+    my $var_prefix_name = join '_', @$path ? @$path : qw(TOP);
+    my $var_prefix = "${var_prefix_name}_";
 
+    push @output_makefiles, "${dir_prefix}Subdir.mk";
     write_makefile($dir_prefix, scalar @$path);
 
     my %targets = (all => []);
@@ -247,7 +250,7 @@ sub process_subtree ($$) {
 
     if ($node->[2]) {
        filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
-                        $var_prefix, \%targets);
+                        $var_prefix, $var_prefix_name, \%targets);
     } else {
        my $sdmk = "${dir_prefix}Subdir.sd.mk";
        if (stat $sdmk) {
@@ -286,9 +289,8 @@ sub process_tree() {
     }
     o "SUBDIRMK_MAKEFILES :=\n";
     o "MAKEFILE_TEMPLATES :=\n";
-    o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
-    foreach my $subdir (@subdirs) {
-       o "SUBDIRMK_MAKEFILES += $subdir/Subdir.mk\n";
+    foreach my $mf (@output_makefiles) {
+       o "SUBDIRMK_MAKEFILES += $mf\n";
     }
     foreach my $input (sort keys %input_files) {
        o "MAKEFILE_TEMPLATES += $input\n";