WIP

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 59430c7cc987977d9f866ae5f0b491903782f4de..ea9cb5b8b36230fd2b9e3d536416b8a44708a5bf 100755 (executable)
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -36,17 +36,40 @@ sub build_tree () {
 
 sub target_varname ($$) {
     my ($var_prefix, $target) = @_;
 
 sub target_varname ($$) {
     my ($var_prefix, $target) = @_;

-    return $vprefix.'TARGETS'.($target eq 'all' ? '' : "_$target");
+    return $var_prefix.'TARGETS'.($target eq 'all' ? '' : "_$target");
+}
+
+our $writing_output;
+our %output_files;
+
+sub close_any_output_file() {
+    return unless defined $writing_output;
+    O->error and die "error writing $writing_output.tmp: $! (?)\n";
+    close O or die "error closing $writing_output.tmp: $!\n";
+    $writing_output = undef;
+}
+
+sub start_output_file ($) {
+    close_any_output_file();
+    ($writing_output) = @_;
+    die if $output_files{$writing_output}++;
+    my $tmp = "$writing_output.tmp";
+    open O, ">", $tmp or die "create $tmp: $!\n";
+}
+
+sub o {
+    die unless defined $writing_output;
+    print O @_ or die "error writing $writing_output.tmp: $!\n";

 }
 
 sub write_makefile ($$) {
     my ($dir_prefix,$depth) = @_;
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
 }
 
 sub write_makefile ($$) {
     my ($dir_prefix,$depth) = @_;
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';

-    o <<END;
+    o sprintf <<'END', $cd, $dir_prefix;

 default: all
 default: all

-%:
-       \$(MAKE) -C $cd ${dir_prefix}$@
+%%:
+       $(MAKE) -C %s %s$@

 END
 }
 
 END
 }
 


@@ -55,7 +78,7 @@ sub filter_subdir_mk ($$$$$) {
        $var_prefix, $targets) = @_;
 
     my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";
        $var_prefix, $targets) = @_;
 
     my $in = "${srcdir}/${dir_prefix}Subdir.mk.in";

-    open I, '<' $in or die "open $in: $!\n";
+    open I, '<', $in or die "open $in: $!\n";

     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_e = qr{[a-z][-+,0-9_a-z]*(?=\W)};
     my $esclit = '&';
     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_e = qr{[a-z][-+,0-9_a-z]*(?=\W)};
     my $esclit = '&';