BEFORE NO BUILD TREE

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 9f3c8c62a43ae7858af834a8595db26e7c245d38..c1866f6bcb29ae5f48858a6c3353e691972046dd 100644 (file)
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -8,25 +8,41 @@
 
 use strict;
 
 
 use strict;
 

-our @allsubdirs = @ARGV;
+our $root = [ '.', [ ] ];
+# each node is [ 'relative subdir name', \@children ]

 
 

-sub write_makefile () {
+sub build_tree () {
+    foreach my $subdir (@ARGV) {
+       my @path = $subdir eq '.' ? () : split m{/+}, $subdir;
+       my $node = $root;
+       foreach my $d (@path) {
+           my ($c,) = grep { $_->[0] eq $d } @{ $node->[1] };
+           if (!$c) {
+               $c = [ $d, [ ] ];
+               push @{ $node->[1] }, $c;
+           }
+           $node = $c;
+       }
+    }
+}
+
+
+
+sub write_makefile ($$) {
+    my ($subdir,$depth) = @_;

     start_output_file("Makefile");
     start_output_file("Makefile");

+    my $cd = $depth ? join('/', ('..',) x $depth) : '.';

     print O <<END;
 %:
     print O <<END;
 %:

-       $(MAKE) -C @top $subdir/$@
+       $(MAKE) -C $cd $subdir/$@

 END
 END

-
-    my @thesedirs = $subdir, grep { $_ =~ m{^$subdir/} } @allsubdirs;
-    printf O "include $_/Subdir.mk"
-       
-
+}

 
 sub process_subdir ($$) {
     my ($subdir) = @_;
 
 sub process_subdir ($$) {
     my ($subdir) = @_;

-    my $d
-    write_makefile($subdir);
+    my $depth = $subdir eq '.' ? 0 : scalar split m{/+}, $subdir;
+    write_makefile($subdir,$depth);

     filter_subdir_mk();
 }
 
     filter_subdir_mk();
 }
 

-foreach (@allsubdirs) { process_subdir($_); }
+build_tree();