subdirmk/*: Some simple whitespace cleanups

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index 6ce18f96d88d55535f830126662e1751536a0aa6..8a5daa6b0fc6269cfc6c2cba935b957a0c62e8e2 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -1,10 +1,14 @@
 #!/usr/bin/perl -w
 #
+# subdirmk - &-filter (makefile generation program)
+#  Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
+#
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # generates in each subdirectory       from in each subdirectory
 #     Subdir.mk.tmp                        Subdir.sd.mk
-#     Makefile
+#     Makefile                          and included files
 # and in toplevel                      and in toplevel
 #     main.mk.tmp                          Perdir.sd.mk
 
@@ -54,6 +58,7 @@ sub target_varname ($$) {
 our $writing_output;
 our $buffering_output;
 our %output_files;
+our %input_files;
 
 sub close_any_output_file() {
     return unless defined $writing_output;
@@ -94,12 +99,12 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-       \@: \$@
 %:     FORCE-ALWAYS-RUN
-       \$(MAKE) -C $cd -f main.mk ${dir_prefix}\$@
+       \@:
 Makefile FORCE-ALWAYS-RUN:
-       \@: \$@
+       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:
+.PHONY:        FORCE-ALWAYS-RUN
 END
 }
 
@@ -124,7 +129,7 @@ sub process_input_mk ($$$$$$$$) {
        die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
        return;
     }
-    o "MAKEFILE_TEMPLATES += $f\n";
+    $input_files{$f}++;
 
     while (<$input>) {
        if (s#^\s*$esc\:##) {
@@ -177,7 +182,7 @@ sub process_input_mk ($$$$$$$$) {
                my $subf = "$srcdir/$2";
                process_input_mk($dir_prefix, $dir_suffix, $dir_name,
                                 $var_prefix, $targets,
-                                $subf, $esclitr, $subf);
+                                $subf, $esclitr, $1);
                o "\n";
            } else {
                die "unknown directive $_ ";
@@ -247,7 +252,7 @@ sub process_subtree ($$) {
        }
        print O "\n";
     }
-    
+
     return @targets;
 }
 
@@ -261,6 +266,9 @@ sub process_tree() {
     foreach my $subdir (@subdirs) {
        o "MAKEFILES += $subdir/Subdir.mk\n";
     }
+    foreach my $input (sort keys %input_files) {
+       o "MAKEFILE_TEMPLATES += $input\n";
+    }
     o "include \$(MAKEFILES)";
 }