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]};
}
$input_files{$f}++;
+ my %srcdirmap = (
+ '^' => "\$(top_srcdir)${dir_suffix}",
+ '~' => "\$(top_srcdir)",
+ );
my %pfxmap = (
'' => $dir_prefix,
- '^' => "\$(top_srcdir)${dir_suffix}/",
- '~' => "\$(top_srcdir)/",
);
+ $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
while (<$input>) {
- if (s#^\s*$esc\:##) {
+ if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
+ $$esclitr = $1;
+ $set_esc->();
+ next;
+ } elsif (s#^\s*$esc\:(?=(-?)include)##) {
$buffering_output='';
+ } elsif (m#^\s*$esc\:([a-z][-0-9a-z_]*)#) {
+ die "unknown directive $1";
+ } elsif (s{^\s*${esc}TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
+ my $t = $1 // 'all';
+ o target_varname($var_prefix, $t);
+ $targets->{$t} //= [ ];
}
for (;;) {
- unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
+ unless (s{^(.*?)$esc}{}) { o $_; last; }
o $1;
- if ($2) { s#^$esc##; o $$esclitr; next; }
- s{^$esc}{} or die "$_ ?";
- if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
- elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
- my $t = $1 // 'all';
- o target_varname($var_prefix, $t);
- $targets->{$t} //= [ ];
- }
+ if (s{^\\$esc}{}) { o "$$esclitr" }
+ elsif (s{^\\\$}{}) { o '$' }
+ elsif (s{^\\\s+$}{}) { }
+ elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
elsif (m{^(?=$caps_re)}) { o $var_prefix }
+ elsif (s{^\$([A-Za-z]\w+)}{}) { o "\$(${var_prefix}$1)" }
elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
elsif (s{^_}{}) { o $var_prefix }
- elsif (s{^=_}{}) { o $var_prefix }
+ elsif (s{^=}{}) { o $var_prefix_name }
elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
- elsif (s{^=/}{}) { o $dir_name }
+ elsif (s{^\.}{}) { o $dir_name }
+ elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} }
elsif (s{^([~^]?)(?=[ \t])}{}) {
my $prefix = $pfxmap{$1} // die;
my $after='';
} elsif (s{^![ \t]+}{}) {
o $_;
$_ = '';
- } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
- $$esclitr = $1;
- $set_esc->();
} else {
die "bad escape $$esclitr$_ ";
}
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";
} else {
- die "unknown directive $_ ";
+ die "internal error buffering directive $_ ";
}
}
}
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";
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);
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);
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) {