Documentation: fix dependency generation.
The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 7, 2005 at 22:21 UTC
fb612d54c1df7e45d174060c1cbdf060accceb6d
2 files changed
+36
-11
Documentation/Makefile
+1
-2
@@ -53,8 +53,7 @@ install: man
53
#
54
# Determine "include::" file references in asciidoc files.
55
#
56
-TEXTFILES = $(wildcard git-*.txt)
57
-doc.dep : $(TEXTFILES) build-docdep.perl
56
+doc.dep : $(wildcard *.txt) build-docdep.perl
57
rm -f $@+ $@
58
perl ./build-docdep.perl >$@+
59
mv $@+ $@
Documentation/build-docdep.perl
+35
-9
@@ -1,28 +1,54 @@
1
#!/usr/bin/perl
2
3
my %include = ();
4
+my %included = ();
5
5
-for my $text (<git-*.txt>) {
6
+for my $text (<*.txt>) {
7
open I, '<', $text || die "cannot read: $text";
7
- (my $base = $text) =~ s/\.txt$//;
8
while (<I>) {
9
if (/^include::/) {
10
chomp;
11
s/^include::\s*//;
12
s/\[\]//;
13
- $include{$base}{$_} = 1;
13
+ $include{$text}{$_} = 1;
14
+ $included{$_} = 1;
15
}
16
}
17
close I;
18
}
19
20
# Do we care about chained includes???
20
-
21
-while (my ($base, $included) = each %include) {
22
- my ($suffix) = '1';
23
- if ($base eq 'git') {
24
- $suffix = '7'; # yuck...
21
+my $changed = 1;
22
+while ($changed) {
23
+ $changed = 0;
24
+ while (my ($text, $included) = each %include) {
25
+ print STDERR "Looking at $text...\n";
26
+ for my $i (keys %$included) {
27
+ print STDERR "$text includes $i.\n";
28
+ # $text has include::$i; if $i includes $j
29
+ # $text indirectly includes $j.
30
+ if (exists $include{$i}) {
31
+ print STDERR "$i includes something.\n";
32
+ for my $j (keys %{$include{$i}}) {
33
+ print STDERR "$text includes $i include $j\n";
34
+ if (!exists $include{$text}{$j}) {
35
+ $include{$text}{$j} = 1;
36
+ $included{$j} = 1;
37
+ $changed = 1;
38
+ }
39
+ }
40
+ }
41
+ }
42
}
26
- print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
43
}
44
45
+while (my ($text, $included) = each %include) {
46
+ if (! exists $included{$text} &&
47
+ (my $base = $text) =~ s/\.txt$//) {
48
+ my ($suffix) = '1';
49
+ if ($base eq 'git') {
50
+ $suffix = '7'; # yuck...
51
+ }
52
+ print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
53
+ }
54
+}