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 out of tree builds
[subdirmk.git]
/
subdirmk
/
generate
diff --git
a/subdirmk/generate
b/subdirmk/generate
index 312b4880f1461b4e6c35a6c516230d74466811a4..a10e055590c9df2c671e85d264ef2bfa7a5cb339 100755
(executable)
--- a/
subdirmk/generate
+++ b/
subdirmk/generate
@@
-1,22
+1,34
@@
#!/usr/bin/perl -w
#
#!/usr/bin/perl -w
#
-# $(srcdir)/
build-aux/subdirmk-setup
SUBDIR...
+# $(srcdir)/
subdirmk/generate [--srcdir=SRCDIR] [--]
SUBDIR...
#
#
-# generates
-# main.mk.tmp
-# and in each subdirectory
+# generates in each subdirectory
# Subdir.mk.tmp
# Makefile
# Subdir.mk.tmp
# Makefile
+# and in toplevel
+# main.mk.tmp
+# from in each subdirectory
+# Subdir.mk.in
+# and at toplevel
+# Perdir.mk.in
use strict;
use strict;
+use POSIX;
-our $srcdir;
-our @subdirs = @ARGV;
+print "$0 @ARGV\n" or die $!;
+
+our $srcdir='.';
-die unless $ARGV[0] eq '--srcdir';
-die unless @ARGV>=2;
-shift @ARGV;
-($srcdir, @subdirs) = @ARGV;
+while (@ARGV && $ARGV[0] =~ m/^-/) {
+ $_ = shift @ARGV;
+ last if $_ eq '--';
+ if (s/^--srcdir=//) {
+ $srcdir=$';
+ } else {
+ die "$0: unknown option \`$_'\n";
+ }
+}
+our @subdirs = @ARGV;
s{/+$}{} foreach @subdirs;
s{/+$}{} foreach @subdirs;
@@
-97,13
+109,13
@@
sub filter_subdir_mk ($$$$$) {
#use Data::Dumper;
#print STDERR "filter @_\n";
#use Data::Dumper;
#print STDERR "filter @_\n";
- my $in = "${dir_prefix}Subdir.mk.in";
+ my $in = "${
srcdir}/${
dir_prefix}Subdir.mk.in";
my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
my $esclit = '&';
my $esc = '\\&';
my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
my $esclit = '&';
my $esc = '\\&';
- for my $f ($in, "Perdir.mk.in") {
+ for my $f ($in, "
${srcdir}/
Perdir.mk.in") {
open I, '<', $f or die "open $f: $!\n";
while (<I>) {
for (;;) {
open I, '<', $f or die "open $f: $!\n";
while (<I>) {
for (;;) {
@@
-139,7
+151,7
@@
sub filter_subdir_mk ($$$$$) {
} elsif (s{^![ \t]+}{}) {
o $_;
$_ = '';
} elsif (s{^![ \t]+}{}) {
o $_;
$_ = '';
- } elsif (s{^!(\
pPosixWord+|\pPosixPunct+)[ \t]*
}{}) {
+ } elsif (s{^!(\
S+)(?:[ \t]+|$)
}{}) {
$esclit = $1;
$esc = $esclit;
$esc =~ s/\W/\\$&/g;
$esclit = $1;
$esc = $esclit;
$esc =~ s/\W/\\$&/g;
@@
-172,6
+184,7
@@
sub process_subtree ($$) {
foreach my $child (@{ $node->[1] }) {
my @childpath = (@$path, $child->[0]);
my $child_subdir = join '/', @childpath;
foreach my $child (@{ $node->[1] }) {
my @childpath = (@$path, $child->[0]);
my $child_subdir = join '/', @childpath;
+ mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!";
push @{ $targets{$_} }, $child_subdir foreach
process_subtree($child, \@childpath);
}
push @{ $targets{$_} }, $child_subdir foreach
process_subtree($child, \@childpath);
}