chiark
/
gitweb
/
~ian
/
subdirmk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f5ac12b
)
better generation of MAKEFILE_TEMPLATES (dedupe)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 13 Nov 2019 16:52:29 +0000
(16:52 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 13 Nov 2019 16:52:29 +0000
(16:52 +0000)
subdirmk/generate
patch
|
blob
|
history
diff --git
a/subdirmk/generate
b/subdirmk/generate
index 6ce18f96d88d55535f830126662e1751536a0aa6..3b40ad0796304f18d66a005f7d2e347526a863aa 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;
@@
-124,7
+125,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\:##) {
@@
-261,6
+262,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)";
}