From e56b3172a2b14ac09c0d9a3aec433fa43c12cdc2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Nov 2019 20:28:18 +0000
Subject: [PATCH] WIP

---
 build-aux/subdirmk-setup | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index f721621..3d8ef7d 100644
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -26,6 +26,11 @@ sub build_tree () {
     }
 }
 
+sub target_varname ($$) {
+    my ($var_prefix, $target) = @_;
+    return $vprefix.'TARGETS'.($target eq 'all' ? '' : "_$target");
+}
+
 sub write_makefile ($$) {
     my ($dir_prefix,$depth) = @_;
     start_output_file("${dir_prefix}Makefile");
@@ -38,8 +43,8 @@ END
 }
 
 sub filter_subdir_mk ($$$$$) {
-    my ($dir_prefix, $dir_suffix, $dir_name, $var_prefix,
-	$targets) = @_;
+    my ($dir_prefix, $dir_suffix, $dir_name,
+	$var_prefix, $targets) = @_;
 
     my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
     open I, '<' $in or die "open $in: $!\n";
@@ -93,11 +98,6 @@ sub filter_subdir_mk ($$$$$) {
     }
 }
 
-sub target_varname ($$) {
-    my ($var_prefix, $target) = @_;
-    return $vprefix.'TARGETS'.($target eq 'all' ? '' : "_$target");
-}
-
 sub process_subtree ($$) {
     # => list of descendants (in form SUBDIR/)
     # recursive, children first
@@ -138,21 +138,18 @@ END
 	}
     }
     
-
-    foreach my $descendant (@descendants) {
-	foreach my $target (@$targets) {
-    print O <<END;
-END
-
-
-sub process_subdir ($$) {
-    my ($subdir) = @_;
-    my $depth = $subdir eq '.' ? 0 : scalar split m{/+}, $subdir;
-    write_makefile($subdir,$depth);
-    filter_subdir_mk();
+    return @targets;
 }
 
+sub process_tree() {
+    process_subtree($root, [ ]);
+    start_output_file("subdirs.mk");
+    o "include Subdir.mk\n";
+    foreach my $subdir (@ARGV) {
+	o "include $subdir/Subdir.mk";
+    }
+}
 
-    
 build_tree();
-process_subtree($root, [ ]);
+process_tree();
+install_output_files();
-- 
2.30.2