X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=9275b25770b818e8346a6c11b0ba532c9e2e4de7;hp=dd22146339b130fc6ffbb7efdd9ab3ce0ccc8515;hb=2a8a5a4b83fa745c7016a68dad7722aed4709705;hpb=6fce06f32c1dd21b5c2d7a142d54b7153d650574

diff --git a/generate b/generate
index dd22146..9275b25 100755
--- a/generate
+++ b/generate
@@ -97,12 +97,16 @@ sub write_makefile ($$) {
     #print STDERR "write_makefile @_\n";
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
+    my $suppress_templates=
+	'$(if $(filter-out clean real-clean, $(subdirmk_targets)),,'.
+	' MAKEFILE_TEMPLATES=)';
     o <<END;
 default: all
-\$(MAKECMDGOALS) all: run-main.mk
+\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
 	\@:
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
 Makefile run-main.mk:
-	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))$suppress_templates
 .SUFFIXES:
 .PHONY:	run-main.mk
 END
@@ -254,6 +258,11 @@ sub process_subtree ($$) {
 	}
 	print O "\n";
     }
+    if (@targets) {
+	print O ".PHONY:";
+	print O " ${dir_prefix}${_}" foreach @targets;
+	print O "\n";
+    }
 
     return @targets;
 }