chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES
[subdirmk.git]
/
generate
diff --git
a/generate
b/generate
index 486bdc54e1c888b7be9cee539918296651cc8010..48db65246e79683812062458da23e654ac1c0a98 100755
(executable)
--- a/
generate
+++ b/
generate
@@
-138,7
+138,7
@@
sub process_input_mk ($$$$$$$$) {
for (;;) {
unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
o $1;
for (;;) {
unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
o $1;
- if ($2) { o $$esclitr; next; }
+ 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)}{}) {
s{^$esc}{} or die "$_ ?";
if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
@@
-264,14
+264,16
@@
sub process_tree() {
foreach my $v (qw(top_srcdir abs_top_srcdir)) {
o "$v=\@$v@\n";
}
foreach my $v (qw(top_srcdir abs_top_srcdir)) {
o "$v=\@$v@\n";
}
- o "MAKEFILES += Subdir.mk\n";
+ o "MAKEFILES :=\n";
+ o "MAKEFILE_TEMPLATES :=\n";
+ o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
foreach my $subdir (@subdirs) {
foreach my $subdir (@subdirs) {
- o "MAKEFILES += $subdir/Subdir.mk\n";
+ o "
SUBDIRMK_
MAKEFILES += $subdir/Subdir.mk\n";
}
foreach my $input (sort keys %input_files) {
o "MAKEFILE_TEMPLATES += $input\n";
}
}
foreach my $input (sort keys %input_files) {
o "MAKEFILE_TEMPLATES += $input\n";
}
- o "include \$(MAKEFILES)";
+ o "include \$(
SUBDIRMK_
MAKEFILES)";
}
build_tree();
}
build_tree();