X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=build-aux%2Fsubdirmk-setup;h=11d0f26c8b131d459951ec3a393accf47ae7b7d3;hb=8a218c94fb8d09a8225d1055555aba0a18b0dbc6;hp=9f3c8c62a43ae7858af834a8595db26e7c245d38;hpb=3fc89ce9c0395620a92340e8290c18e156ca367e;p=subdirmk.git

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 9f3c8c6..11d0f26 100644
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -10,23 +10,36 @@ use strict;
 
 our @allsubdirs = @ARGV;
 
-sub write_makefile () {
+sub write_makefile ($$) {
+    my ($subdir,$depth)
     start_output_file("Makefile");
+    my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     print O <<END;
+# autogenerated - do not edit
 %:
-	$(MAKE) -C @top $subdir/$@
+	\$(MAKE) -C $cd $subdir/\$@
 END
+}
+
+sub require_subdir ($) {
+    # => list of descendant subdirs
+    my ($here) = (@_);
+    my $prefix = $here eq '.' ? qr{} : qr{$prefix/};
+    my @children = grep { m{^$prefix[^/]+$} } @allsubdirs;
+    my @descendants;
+    foreach my $child (@children) {
+	push @descendants, require_subdir(
 
-    my @thesedirs = $subdir, grep { $_ =~ m{^$subdir/} } @allsubdirs;
+	$subdir, grep { $_ =~ m{^$subdir/} } 
     printf O "include $_/Subdir.mk"
 	
 
 
 sub process_subdir ($$) {
     my ($subdir) = @_;
-    my $d
-    write_makefile($subdir);
-    filter_subdir_mk();
+    my $depth = $subdir eq '.' ? 0 : scalar split m{/+}, $subdir;
+    write_makefile($subdir,$depth);
+    require_subdir($subdir);
 }
 
 foreach (@allsubdirs) { process_subdir($_); }