X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=subdirmk%2Fgenerate;h=fbf07d4664fc6c46a7382679a2fc6affae8b90a5;hb=32f2d681625cb2d4bde2d155e5b95ec12d0e753d;hp=3b40ad0796304f18d66a005f7d2e347526a863aa;hpb=6dd3d7f7bf3899308f7e341392a0349c2ab8c031;p=subdirmk.git

diff --git a/subdirmk/generate b/subdirmk/generate
index 3b40ad0..fbf07d4 100755
--- 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
 
@@ -95,11 +99,10 @@ 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:
 END
 }
@@ -178,7 +181,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 $_ ";