wip

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

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 8a41d47195088b585a524e547c656b1abd3749b6..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 ]
 
@@ -72,13 +74,16 @@ sub install_output_files () {
 
 sub write_makefile ($$) {
     my ($dir_prefix,$depth) = @_;
-    print STDERR "write_makefile @_\n";
+    #print STDERR "write_makefile @_\n";
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-%:
-       \$(MAKE) -C $cd ${dir_prefix}\$@
+%:     FORCE-ALWAYS-RUN
+       \$(MAKE) -C $cd -f subdirs.mk ${dir_prefix}\$@
+Makefile FORCE-ALWAYS-RUN:
+       : \$@
+.SUFFIXES:
 END
 }
 
@@ -86,17 +91,18 @@ sub filter_subdir_mk ($$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
        $var_prefix, $targets) = @_;
 
-    use Data::Dumper;
-    print STDERR "filter @_\n";
+    #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";
     }
 }
 
@@ -147,8 +155,8 @@ sub process_subtree ($$) {
     # recursive, children first
     my ($node, $path) = @_;
 
-    use Data::Dumper;
-    print STDERR Dumper(\@_);
+    #use Data::Dumper;
+    #print STDERR Dumper(\@_);
 
     my $dir_prefix = join '', map { "$_/" } @$path;
     my $dir_suffix = join '', map { "/$_" } @$path;
@@ -175,16 +183,11 @@ sub process_subtree ($$) {
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);
-       print O <<END;
-${dir_prefix}${target}: \$($target_varname)
-END
-       if (@child_subdirs) {
-           print O "${dir_prefix}${target}:";
-           foreach my $child_subdir (@child_subdirs) {
-               print O " $child_subdir/$target";
-           }
-           print O "\n";
+       print O "${dir_prefix}${target}: \$($target_varname)";
+       foreach my $child_subdir (@child_subdirs) {
+           print O " $child_subdir/$target";
        }
+       print O "\n";
     }
     
     return @targets;
@@ -192,11 +195,15 @@ END
 
 sub process_tree() {
     process_subtree($root, [ ]);
-    start_output_file("subdirs.mk");
-    o "include Subdir.mk\n";
+    start_output_file("subdirs.mk.tmp");
+    foreach my $v (qw(top_srcdir abs_top_srcdir)) {
+       o "$v=\@$v@\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();