From 221527df677cfc4d7146a6db2c4c089e36ef6157 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 15 Oct 2016 12:38:34 +0200
Subject: [PATCH] scan-adoc-refs: cleanup makefile generation

---
 scan-adoc-refs | 115 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 40 deletions(-)

diff --git a/scan-adoc-refs b/scan-adoc-refs
index 538a863..afbabb3 100755
--- a/scan-adoc-refs
+++ b/scan-adoc-refs
@@ -329,6 +329,40 @@ foreach my $e (@$start_env) {
     }
 }
 
+my $makevar_hash = {};
+
+sub makevar_define {
+    my ($varname) = @_;
+
+    die "makefile variable '$varname' already defined\n"
+	if exists($makevar_hash->{$varname});
+
+    $makevar_hash->{$varname} = {};
+}
+
+sub makevar_list_add {
+    my ($varname, $value) = @_;
+
+    die "makefile variable '$varname' not defined\n"
+	if !exists($makevar_hash->{$varname});
+
+    $makevar_hash->{$varname}->{$value} = 1;
+}
+
+sub makevar_dump {
+    my $txt = '';
+
+    foreach my $varname (sort keys %$makevar_hash) {
+	$txt .= "$varname =";
+	foreach my $value (sort keys %{$makevar_hash->{$varname}}) {
+	    $txt .= " \\\n\t$value";
+	}
+	$txt .= "\n\n";
+    }
+
+    return $txt;
+}
+
 if ($generate_depends) {
 
     my $tmpfilename = "${generate_depends}.tmp";
@@ -345,8 +379,6 @@ if ($generate_depends) {
 	}
     }
 
-    my $res = '';
-
     my $depend_varname_hash = {};
 
     foreach my $fn (sort keys %$depends) {
@@ -354,19 +386,24 @@ if ($generate_depends) {
 	$basename =~s/\.adoc$//i;
 	$basename =~s/[^A-Za-z0-9]/_/g;
 
-	my $var1text = "${basename}_ADOCSOURCES =";
-	my $var2text = "${basename}_ADOCDEPENDS = \$\{${basename}_ADOCSOURCES\}";
-	$depend_varname_hash->{$fn} = "${basename}_ADOCDEPENDS";
+	my $varname1 = "${basename}_ADOCSOURCES";
+	my $varname2 = "${basename}_ADOCDEPENDS";
+
+	makevar_define($varname1);
+	makevar_define($varname2);
+
+	$depend_varname_hash->{$fn} = $varname2;
+
+	makevar_list_add($varname1, $fn);
+	makevar_list_add($varname2, "\$\{$varname1\}");
 
 	foreach my $dep (sort keys %{$depends->{$fn}}) {
 	    if ($dep =~ m/-(opts|synopsis).adoc$/) {
-		$var2text .= " \\\n\t$dep";
+		makevar_list_add($varname2, $dep);
 	    } else {
-		$var1text .= " \\\n\t$dep";
+		makevar_list_add($varname1, $dep);
 	    }
 	}
-	$res .= "$var1text\n\n";
-	$res .= "$var2text\n\n";
     }
 
     my $man_sources_hash = {};
@@ -380,58 +417,56 @@ if ($generate_depends) {
 	}
     }
 
-    my $make_targets = {};
-    foreach my $e (@$start_env) {
-	my $filelist = $fileinfo->{outfile}->{$e};
-	foreach my $sourcefile (sort keys %$filelist) {
-	    my $varname = $depend_varname_hash->{$sourcefile};
-	    my $target = $filelist->{$sourcefile};
-	    my $dep = "\$\{$varname\}";
-	    $make_targets->{$target} = $dep;
-	    if ($e eq 'manvolnum') {
-		$make_targets->{"$target.html"} = $dep;
-		$make_targets->{"$target-plain.html"} = $dep;
-	    }
-	}
-    }
-    foreach my $target (sort keys%$make_targets) {
-	my $dep = $make_targets->{$target};
-	$res .= "$target: $dep\n\n";
-    }
-
     my $varname = "MANUAL_SOURCES";
-    $res .= "$varname =";
+    makevar_define($varname);
     foreach my $sourcefile (sort keys %$man_sources_hash) {
-	$res .= " \\\n\t$sourcefile";
+	makevar_list_add($varname, $sourcefile);
     }
-    $res .= "\n\n";
 
     $varname = "CHAPTER_LIST";
-    $res .= "$varname =";
+    makevar_define($varname);
     my $filelist = $fileinfo->{outfile}->{default};
     foreach my $sourcefile (sort keys %$filelist) {
 	my $target = $filelist->{$sourcefile};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
     }
-    $res .= "\n\n";
 
     $varname = "MANUAL_PAGES";
-    $res .= "$varname =";
+    makevar_define($varname);
     $filelist = $fileinfo->{outfile}->{manvolnum};
     foreach my $manpage (sort keys %$filelist) {
 	my $target = $filelist->{$manpage};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
     }
-    $res .= "\n\n";
 
     $varname = "WIKI_IMPORTS";
-    $res .= "$varname =";
+    makevar_define($varname);
     $filelist = $fileinfo->{outfile}->{wiki};
     foreach my $sourcefile (sort keys %$filelist) {
 	my $target = $filelist->{$sourcefile};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
+    }
+
+    my $res = makevar_dump();
+
+    my $make_targets = {};
+    foreach my $e (@$start_env) {
+	my $filelist = $fileinfo->{outfile}->{$e};
+	foreach my $sourcefile (sort keys %$filelist) {
+	    my $varname = $depend_varname_hash->{$sourcefile};
+	    my $target = $filelist->{$sourcefile};
+	    my $dep = "\$\{$varname\}";
+	    $make_targets->{$target} = $dep;
+	    if ($e eq 'manvolnum') {
+		$make_targets->{"$target.html"} = $dep;
+		$make_targets->{"$target-plain.html"} = $dep;
+	    }
+	}
+    }
+    foreach my $target (sort keys%$make_targets) {
+	my $dep = $make_targets->{$target};
+	$res .= "$target: $dep\n\n";
     }
-    $res .= "\n\n";
 
     print $outfh $res;
     close($outfh);
-- 
2.39.2