X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=scan-adoc-refs;h=9252701634d239e832bac4f72c14c4fac30edb8b;hp=afbabb34f7e8c1a14ed3ab29867029a007db4c75;hb=b473f999f6bd6fb541fb46559db1855dd6899160;hpb=221527df677cfc4d7146a6db2c4c089e36ef6157

diff --git a/scan-adoc-refs b/scan-adoc-refs
index afbabb3..9252701 100755
--- a/scan-adoc-refs
+++ b/scan-adoc-refs
@@ -161,16 +161,16 @@ sub scan_adoc_file {
 
 	# try to detect titles
 	foreach my $e (@{$env_stack->[-1]}) {
-	    if ($line =~ m/^=====+$/) {
+	    if ($line =~ m/^===+$/) {
 		register_title($filename, $e, 0, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^-----+$/) {
+	    } elsif ($line =~ m/^---+$/) {
 		register_title($filename, $e, 1, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^~~~~~+$/) {
+	    } elsif ($line =~ m/^~~~+$/) {
 		register_title($filename, $e, 2, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^\^\^\^\^\^+$/) {
+	    } elsif ($line =~ m/^\^\^\^+$/) {
 		register_title($filename, $e, 3, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
 	    } elsif ($line =~ m/^= +(\S.*?)( +=)?$/) {
@@ -233,6 +233,7 @@ sub scan_adoc_file {
 my $scanned_files = {};
 while (my $filename = shift) {
     next if $filename !~ m/\.adoc$/; # skip attributes.txt
+    next if $filename =~ m/-(opts|synopsis)\.adoc$/;
     next if $scanned_files->{$filename};
 
     scan_adoc_file($filename);
@@ -372,9 +373,21 @@ if ($generate_depends) {
     my $depends = {};
     foreach my $e (@$start_env) {
 	my $env_data = $fileinfo->{include}->{$e};
+
+	my $add_depends;
+
+	$add_depends = sub {
+	    my ($fn, $dep) = @_;
+
+	    $depends->{$fn}->{$dep} = 1;
+	    foreach my $nd (keys %{$env_data->{$dep}}) {
+		&$add_depends($fn, $nd);
+	    }
+	};
+
 	foreach my $fn (keys %$env_data) {
 	    foreach my $dep (keys %{$env_data->{$fn}}) {
-		$depends->{$fn}->{$dep} = 1;
+		&$add_depends($fn, $dep);
 	    }
 	}
     }
@@ -454,6 +467,7 @@ if ($generate_depends) {
 	my $filelist = $fileinfo->{outfile}->{$e};
 	foreach my $sourcefile (sort keys %$filelist) {
 	    my $varname = $depend_varname_hash->{$sourcefile};
+	    next if !defined($varname);
 	    my $target = $filelist->{$sourcefile};
 	    my $dep = "\$\{$varname\}";
 	    $make_targets->{$target} = $dep;