summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
172acde)
Replace all other calls to `o' with `oraw'. This ensures we
have no stray calls.
It elminates an anomaly, namely that calls outside process_input_mk
would rely on the $buffering_output variable which is set only there.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
$writing_output = undef;
}
$writing_output = undef;
}
-sub o {
- if (defined $buffering_output) {
- $buffering_output .= $_ foreach @_;
- return;
- }
die unless defined $writing_output;
print O @_ or die "error writing $writing_output.tmp: $!\n";
}
sub od { # maybe $-doubled
die unless defined $writing_output;
print O @_ or die "error writing $writing_output.tmp: $!\n";
}
sub od { # maybe $-doubled
+ if (defined $buffering_output) {
+ $buffering_output .= $_ foreach @_;
+ return;
+ }
+ oraw @_;
}
sub start_output_file ($) {
}
sub start_output_file ($) {
die "$writing_output ?" if $output_files{$writing_output}++;
my $tmp = "$writing_output.tmp";
open O, ">", $tmp or die "create $tmp: $!\n";
die "$writing_output ?" if $output_files{$writing_output}++;
my $tmp = "$writing_output.tmp";
open O, ">", $tmp or die "create $tmp: $!\n";
- o "# autogenerated - do not edit\n";
+ oraw "# autogenerated - do not edit\n";
}
sub install_output_files () {
}
sub install_output_files () {
my $suppress_templates=
'$(if $(filter-out clean real-clean, $(subdirmk_targets)),,'.
' MAKEFILE_TEMPLATES=)';
my $suppress_templates=
'$(if $(filter-out clean real-clean, $(subdirmk_targets)),,'.
' MAKEFILE_TEMPLATES=)';
default: all
\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
\@:
default: all
\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
\@:
my @targets = sort keys %targets;
foreach my $target (@targets) {
my @targets = sort keys %targets;
foreach my $target (@targets) {
process_final(\@targets);
start_output_file("main.mk.tmp");
foreach my $v (qw(top_srcdir abs_top_srcdir)) {
process_final(\@targets);
start_output_file("main.mk.tmp");
foreach my $v (qw(top_srcdir abs_top_srcdir)) {
- o "SUBDIRMK_MAKEFILES :=\n";
- o "MAKEFILE_TEMPLATES :=\n";
+ oraw "SUBDIRMK_MAKEFILES :=\n";
+ oraw "MAKEFILE_TEMPLATES :=\n";
foreach my $mf (@output_makefiles) {
foreach my $mf (@output_makefiles) {
- o "SUBDIRMK_MAKEFILES += $mf\n";
+ oraw "SUBDIRMK_MAKEFILES += $mf\n";
}
foreach my $input (sort keys %input_files) {
}
foreach my $input (sort keys %input_files) {
- o "MAKEFILE_TEMPLATES += $input\n";
+ oraw "MAKEFILE_TEMPLATES += $input\n";
- o "include \$(SUBDIRMK_MAKEFILES)\n";
+ oraw "include \$(SUBDIRMK_MAKEFILES)\n";