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

diff --git a/generate b/generate
index f46747d..fe3e3f5 100755
--- a/generate
+++ b/generate
@@ -97,14 +97,18 @@ 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
-%:	FORCE-ALWAYS-RUN
+\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
 	\@:
-Makefile FORCE-ALWAYS-RUN:
-	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
+Makefile run-main.mk:
+	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))$suppress_templates
 .SUFFIXES:
-.PHONY:	FORCE-ALWAYS-RUN
+.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;
 }
@@ -273,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();