X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=fe3e3f5866674bcf17fa69ea6addaba1225cb3bb;hp=22e8aff57e36abf60d977acebd89ddeebaa91236;hb=dfb1a80a5221a604eecc76164cab7de962e426c2;hpb=e149e53837aae5e1cfb39b44bb0a00ea8b185016

diff --git a/generate b/generate
index 22e8aff..fe3e3f5 100755
--- a/generate
+++ b/generate
@@ -97,13 +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
 \$(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},\$(subdirmk_targets))
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))$suppress_templates
 .SUFFIXES:
 .PHONY:	run-main.mk
 END
@@ -255,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;
 }
@@ -274,7 +282,7 @@ sub process_tree() {
     foreach my $input (sort keys %input_files) {
 	o "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(SUBDIRMK_MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)\n";
 }
 
 build_tree();