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

diff --git a/generate b/generate
index b4c52ae..9275b25 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
 }
 
@@ -133,8 +137,8 @@ sub process_input_mk ($$$$$$$$) {
 
     my %pfxmap = (
 		  ''  => $dir_prefix,
-		  ',' => "\$(top_srcdir)${dir_suffix}/",
-		  ';' => "\$(top_srcdir)/",
+		  '^' => "\$(top_srcdir)${dir_suffix}/",
+		  '~' => "\$(top_srcdir)/",
 		 );
 
     while (<$input>) {
@@ -153,12 +157,12 @@ sub process_input_mk ($$$$$$$$) {
 		$targets->{$t} //= [ ];
 	    }
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
-	    elsif (s{^([,;]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
+	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
 	    elsif (s{^=_}{}) { o $var_prefix }
-	    elsif (s{^([,;]?)/}{}) { o $pfxmap{$1} }
+	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
 	    elsif (s{^=/}{}) { o $dir_name }
-	    elsif (s{^([,;]?)(?=[ \t])}{}) {
+	    elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die;
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
@@ -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;
 }