# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
#
# generates in each subdirectory
-# Subdir.mk.tmp
+# Dir.mk.tmp
# Makefile
# and in toplevel
# main.mk.tmp
local $ddbl;
my @nest = (['']);
+ my $evalcall_brackets;
my $push_nest = sub {
my ($nk, $nndbl, $what) = @_;
: s{^(.*?)($esc)}{}) { od $_; last; }
od $1;
if ($2 eq '{') {
- $ddbl++;
+ od $2;
+ $evalcall_brackets++;
next;
} elsif ($2 eq '}') {
- next if --$ddbl;
+ od $2;
+ next if --$evalcall_brackets;
$pop_nest->('eval');
- od '}}';
+ od '}';
next;
}
if (s{^\\$esc}{}) { od "$$esclitr" }
elsif (s{^\$\{}{}) {
err 'macro invocation cannot be re-$-doubled' if $ddbl;
od '${eval ${call ';
+ $evalcall_brackets = 1;
$push_nest->('eval',1, '&${...}');
} elsif (s{^([~^]?)(?=[ \t])}{}) {
my $prefix = $pfxmap{$1} // die "internal error ($1?)";
my ($f, $enoentok) = @_;
process_input_mk($targets, "${srcdir}/$f", \$esclit, $enoentok);
};
- $pi->("Prefix.sd.mk", 1);
- $pi->("${dir_prefix}Subdir.sd.mk", 0);
- $pi->("Suffix.sd.mk", 1);
+ $pi->("Prefix.sd.mk", 1);
+ $pi->("${dir_prefix}Dir.sd.mk", 0);
+ $pi->("Suffix.sd.mk", 1);
}
sub process_subtree ($$);
# ^ this is the only var which we need before we come back from
# the recursion.
- push @output_makefiles, "${dir_prefix}Subdir.mk";
+ push @output_makefiles, "${dir_prefix}Dir.mk";
write_makefile($dir_prefix, scalar @$path);
my %targets = (all => []);
}
set_dir_vars($path);
- start_output_file("${dir_prefix}Subdir.mk.tmp");
+ start_output_file("${dir_prefix}Dir.mk.tmp");
if ($node->[2]) {
filter_subdir_mk(\%targets);
} else {
- my $sdmk = "${dir_prefix}Subdir.sd.mk";
+ my $sdmk = "${dir_prefix}Dir.sd.mk";
if (stat $sdmk) {
die
"subdirmk: $sdmk unexpectedly exists (${dir_prefix} not mentioned on subdirmk/generate command line, maybe directory is missing from SUBDIRMK_SUBDIRS)";
my @targets = sort keys %targets;
foreach my $target (@targets) {
my $target_varname = target_varname($var_prefix, $target);
- print O "${dir_prefix}${target}:: \$($target_varname)";
+ oraw "${dir_prefix}${target}:: \$($target_varname)";
foreach my $child_subdir (@{ $targets{$target} }) {
- print O " $child_subdir/$target";
+ oraw " $child_subdir/$target";
}
- print O "\n";
+ oraw "\n";
}
if (@targets) {
- print O ".PHONY:";
- print O " ${dir_prefix}${_}" foreach @targets;
- print O "\n";
+ oraw ".PHONY:";
+ oraw " ${dir_prefix}${_}" foreach @targets;
+ oraw "\n";
}
return @targets;