From 6dd3d7f7bf3899308f7e341392a0349c2ab8c031 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 16:52:29 +0000
Subject: [PATCH] better generation of MAKEFILE_TEMPLATES (dedupe)

---
 subdirmk/generate | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/subdirmk/generate b/subdirmk/generate
index 6ce18f9..3b40ad0 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -54,6 +54,7 @@ sub target_varname ($$) {
 our $writing_output;
 our $buffering_output;
 our %output_files;
+our %input_files;
 
 sub close_any_output_file() {
     return unless defined $writing_output;
@@ -124,7 +125,7 @@ sub process_input_mk ($$$$$$$$) {
 	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
 	return;
     }
-    o "MAKEFILE_TEMPLATES += $f\n";
+    $input_files{$f}++;
 
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
@@ -261,6 +262,9 @@ sub process_tree() {
     foreach my $subdir (@subdirs) {
 	o "MAKEFILES += $subdir/Subdir.mk\n";
     }
+    foreach my $input (sort keys %input_files) {
+	o "MAKEFILE_TEMPLATES += $input\n";
+    }
     o "include \$(MAKEFILES)";
 }
 
-- 
2.30.2