Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-sub process_input_mk ($$$$$$$$);
-sub process_input_mk ($$$$$$$$) {
+sub process_input_mk ($$$$$$$$$);
+sub process_input_mk ($$$$$$$$$) {
my ($dir_prefix, $dir_suffix, $dir_name,
my ($dir_prefix, $dir_suffix, $dir_name,
+ $var_prefix, $var_prefix_name, $targets,
$f, $esclitr, $enoent_ok) = @_;
my $caps_re = qr{[A-Z]};
$f, $esclitr, $enoent_ok) = @_;
my $caps_re = qr{[A-Z]};
if (m#^(-?)include\s+(\S+)\s+$#) {
my $subf = "$srcdir/$2";
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
if (m#^(-?)include\s+(\S+)\s+$#) {
my $subf = "$srcdir/$2";
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+ $var_prefix, $var_prefix_name, $targets,
$subf, $esclitr, $1);
o "\n";
} elsif (m#^changequote\s+(\S+)\s+$#) {
$subf, $esclitr, $1);
o "\n";
} elsif (m#^changequote\s+(\S+)\s+$#) {
close $input or die "close $f: $!\n";
}
close $input or die "close $f: $!\n";
}
-sub filter_subdir_mk ($$$$$) {
+sub filter_subdir_mk ($$$$$$) {
my ($dir_prefix, $dir_suffix, $dir_name,
my ($dir_prefix, $dir_suffix, $dir_name,
- $var_prefix, $targets) = @_;
+ $var_prefix, $var_prefix_name, $targets) = @_;
#use Data::Dumper;
#print STDERR "filter @_\n";
#use Data::Dumper;
#print STDERR "filter @_\n";
my $pi = sub {
my ($f, $enoentok) = @_;
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
my $pi = sub {
my ($f, $enoentok) = @_;
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+ $var_prefix, $var_prefix_name, $targets,
"${srcdir}/$f", \$esclit, $enoentok);
};
$pi->("${dir_prefix}Subdir.sd.mk", 0);
"${srcdir}/$f", \$esclit, $enoentok);
};
$pi->("${dir_prefix}Subdir.sd.mk", 0);
my $dir_prefix = join '', map { "$_/" } @$path;
my $dir_suffix = join '', map { "/$_" } @$path;
my $dir_name = join '/', @$path ? @$path : '.';
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);
push @output_makefiles, "${dir_prefix}Subdir.mk";
write_makefile($dir_prefix, scalar @$path);
if ($node->[2]) {
filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
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) {
} else {
my $sdmk = "${dir_prefix}Subdir.sd.mk";
if (stat $sdmk) {