wip

[subdirmk.git] / build-aux / subdirmk-setup

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 976e3ce0055a74ff4eeb0ae654efca55587c55ba..603dab6f6cdbeebd9ed3270ebf99de34d1300f97 100755 (executable)
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -16,6 +16,8 @@ die unless @ARGV>=2;
 shift @ARGV;
 ($srcdir, @subdirs) = @ARGV;
 
+s{/+$}{} foreach @subdirs;
+
 our $root = [ '.', [ ] ];
 # each node is [ 'relative subdir name', \@children ]
 
@@ -77,8 +79,11 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-%:
+%:     FORCE-ALWAYS-RUN
        \$(MAKE) -C $cd -f subdirs.mk ${dir_prefix}\$@
+Makefile FORCE-ALWAYS-RUN:
+       : \$@
+.SUFFIXES:
 END
 }
 
@@ -89,14 +94,15 @@ sub filter_subdir_mk ($$$$$) {
     #use Data::Dumper;
     #print STDERR "filter @_\n";
 
-    my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
-    open I, '<', $in or die "open $in: $!\n";
+    my $in = "${dir_prefix}Subdir.mk.in";
     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
     my $esclit = '&';
     my $esc = '\\&';
 
-    while (<I>) {
+    for my $f ($in, "Perdir.mk.in") {
+      open I, '<', $f or die "open $f: $!\n";
+      while (<I>) {
        for (;;) {
            unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
            o $1;
@@ -138,6 +144,8 @@ sub filter_subdir_mk ($$$$$) {
                die "bad escape $esclit$_ ";
            }
        }
+      }
+      I->error and die "read $f: $!\n";
     }
 }
 
@@ -191,10 +199,11 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
        o "$v=\@$v@\n";
     }
-    o "include Subdir.mk\n";
+    o "MAKEFILES += Subdir.mk\n";
     foreach my $subdir (@subdirs) {
-       o "include $subdir/Subdir.mk\n";
+       o "MAKEFILES += $subdir/Subdir.mk\n";
     }
+    o "include \$(MAKEFILES)";
 }
 
 build_tree();