chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stub Makefile to use MAKECMDGOALS
[subdirmk.git]
/
subdirmk
/
generate
diff --git
a/subdirmk/generate
b/subdirmk/generate
index 8abc04062bed2867e4025acf9eaed62f8b525059..aae2e481e5992fb0068ef1ff2b71a10af75c17e7 100755
(executable)
--- a/
subdirmk/generate
+++ b/
subdirmk/generate
@@
-54,6
+54,7
@@
sub target_varname ($$) {
our $writing_output;
our $buffering_output;
our %output_files;
our $writing_output;
our $buffering_output;
our %output_files;
+our %input_files;
sub close_any_output_file() {
return unless defined $writing_output;
sub close_any_output_file() {
return unless defined $writing_output;
@@
-94,11
+95,10
@@
sub write_makefile ($$) {
my $cd = $depth ? join('/', ('..',) x $depth) : '.';
o <<END;
default: all
my $cd = $depth ? join('/', ('..',) x $depth) : '.';
o <<END;
default: all
- \@: \$@
%: FORCE-ALWAYS-RUN
%: FORCE-ALWAYS-RUN
- \
$(MAKE) -C $cd -f main.mk ${dir_prefix}\$@
+ \
@:
Makefile FORCE-ALWAYS-RUN:
Makefile FORCE-ALWAYS-RUN:
- \
@: \$@
+ \
$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(MAKECMDGOALS))
.SUFFIXES:
END
}
.SUFFIXES:
END
}
@@
-109,8
+109,8
@@
sub process_input_mk ($$$$$$$$) {
$var_prefix, $targets,
$f, $esclitr, $enoent_ok) = @_;
$var_prefix, $targets,
$f, $esclitr, $enoent_ok) = @_;
- my $caps_re = qr{[A-Z]
[0-9_A-Z]*(?=\W)
};
- my $lc_re = qr{[a-z]
[-+,0-9_a-z]*(?=\W)
};
+ my $caps_re = qr{[A-Z]};
+ my $lc_re = qr{[a-z]};
my $esc;
my $set_esc = sub {
my $esc;
my $set_esc = sub {
@@
-124,7
+124,7
@@
sub process_input_mk ($$$$$$$$) {
die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
return;
}
die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
return;
}
-
o "MAKEFILE_TEMPLATES += $f\n"
;
+
$input_files{$f}++
;
while (<$input>) {
if (s#^\s*$esc\:##) {
while (<$input>) {
if (s#^\s*$esc\:##) {
@@
-177,7
+177,7
@@
sub process_input_mk ($$$$$$$$) {
my $subf = "$srcdir/$2";
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
$var_prefix, $targets,
my $subf = "$srcdir/$2";
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
$var_prefix, $targets,
- $subf, $esclitr, $
subf
);
+ $subf, $esclitr, $
1
);
o "\n";
} else {
die "unknown directive $_ ";
o "\n";
} else {
die "unknown directive $_ ";
@@
-261,6
+261,9
@@
sub process_tree() {
foreach my $subdir (@subdirs) {
o "MAKEFILES += $subdir/Subdir.mk\n";
}
foreach my $subdir (@subdirs) {
o "MAKEFILES += $subdir/Subdir.mk\n";
}
+ foreach my $input (sort keys %input_files) {
+ o "MAKEFILE_TEMPLATES += $input\n";
+ }
o "include \$(MAKEFILES)";
}
o "include \$(MAKEFILES)";
}