chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better generation of MAKEFILE_TEMPLATES (dedupe)
[subdirmk.git]
/
subdirmk
/
generate
diff --git
a/subdirmk/generate
b/subdirmk/generate
index 55323d2770aec5d0ecfa2a96a132acaeaa1eb7cf..3b40ad0796304f18d66a005f7d2e347526a863aa 100755
(executable)
--- a/
subdirmk/generate
+++ b/
subdirmk/generate
@@
-3,10
+3,10
@@
# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
#
# generates in each subdirectory from in each subdirectory
# $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
#
# generates in each subdirectory from in each subdirectory
-# Subdir.mk.tmp Subdir.
mk.in
+# Subdir.mk.tmp Subdir.
sd.mk
# Makefile
# and in toplevel and in toplevel
# Makefile
# and in toplevel and in toplevel
-# main.mk.tmp Perdir.
mk.in
+# main.mk.tmp Perdir.
sd.mk
use strict;
use POSIX;
use strict;
use POSIX;
@@
-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;
@@
-109,8
+110,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,6
+125,8
@@
sub process_input_mk ($$$$$$$$) {
die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
return;
}
die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
return;
}
+ $input_files{$f}++;
+
while (<$input>) {
if (s#^\s*$esc\:##) {
$buffering_output='';
while (<$input>) {
if (s#^\s*$esc\:##) {
$buffering_output='';
@@
-173,7
+176,6
@@
sub process_input_mk ($$$$$$$$) {
$buffering_output=undef;
if (m#^(-?)include\s+(\S+)\s+$#) {
my $subf = "$srcdir/$2";
$buffering_output=undef;
if (m#^(-?)include\s+(\S+)\s+$#) {
my $subf = "$srcdir/$2";
- o "MAKEFILE_TEMPLATES += $subf\n";
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
$var_prefix, $targets,
$subf, $esclitr, $subf);
process_input_mk($dir_prefix, $dir_suffix, $dir_name,
$var_prefix, $targets,
$subf, $esclitr, $subf);
@@
-202,8
+204,8
@@
sub filter_subdir_mk ($$$$$) {
$var_prefix, $targets,
"${srcdir}/$f", \$esclit, $enoentok);
};
$var_prefix, $targets,
"${srcdir}/$f", \$esclit, $enoentok);
};
- $pi->("${dir_prefix}Subdir.
mk.in
", 0);
- $pi->("Perdir.
mk.in
", 1);
+ $pi->("${dir_prefix}Subdir.
sd.mk
", 0);
+ $pi->("Perdir.
sd.mk
", 1);
}
sub process_subtree ($$);
}
sub process_subtree ($$);
@@
-240,7
+242,7
@@
sub process_subtree ($$) {
my @targets = sort keys %targets;
foreach my $target (@targets) {
my $target_varname = target_varname($var_prefix, $target);
my @targets = sort keys %targets;
foreach my $target (@targets) {
my $target_varname = target_varname($var_prefix, $target);
- print O "${dir_prefix}${target}: \$($target_varname)";
+ print O "${dir_prefix}${target}:
:
\$($target_varname)";
foreach my $child_subdir (@{ $targets{$target} }) {
print O " $child_subdir/$target";
}
foreach my $child_subdir (@{ $targets{$target} }) {
print O " $child_subdir/$target";
}
@@
-260,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)";
}