X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=subdirmk%2Fgenerate;h=dd22146339b130fc6ffbb7efdd9ab3ce0ccc8515;hb=359d8b326411f7e9c2418c094a130b0db14d859f;hp=48db65246e79683812062458da23e654ac1c0a98;hpb=6522f1c523c246d62441d717936704d7a7f1e979;p=secnet.git

diff --git a/subdirmk/generate b/subdirmk/generate
index 48db652..dd22146 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -99,12 +99,12 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-%:	FORCE-ALWAYS-RUN
+\$(MAKECMDGOALS) all: run-main.mk
 	\@:
-Makefile FORCE-ALWAYS-RUN:
+Makefile run-main.mk:
 	\$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:
-.PHONY:	FORCE-ALWAYS-RUN
+.PHONY:	run-main.mk
 END
 }
 
@@ -131,6 +131,12 @@ sub process_input_mk ($$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %pfxmap = (
+		  ''  => $dir_prefix,
+		  '^' => "\$(top_srcdir)${dir_suffix}/",
+		  '~' => "\$(top_srcdir)/",
+		 );
+
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $buffering_output='';
@@ -147,19 +153,13 @@ sub process_input_mk ($$$$$$$$) {
 		$targets->{$t} //= [ ];
 	    }
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
-	    elsif (m{^(?=$lc_re)}) { o $dir_prefix }
+	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
-	    elsif (s{^/}{}) { o $dir_prefix }
 	    elsif (s{^=_}{}) { o $var_prefix }
+	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
 	    elsif (s{^=/}{}) { o $dir_name }
-	    elsif (s{^\^}{}) { o "\$(top_srcdir)${dir_suffix}" }
-	    elsif (s{^\}}{}) { o "\$(abs_top_srcdir)${dir_suffix}" }
-	    elsif (s{^(?:[ \t]+([~^]))?(?=[ \t])}{}) {
-		my $prefix =
-		    !$1       ? $dir_prefix                     :
-		    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
-		    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
-		    die;
+	    elsif (s{^([~^]?)(?=[ \t])}{}) {
+		my $prefix = $pfxmap{$1} // die;
 		my $after='';
 		if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
 		s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;
@@ -264,7 +264,7 @@ sub process_tree() {
     foreach my $v (qw(top_srcdir abs_top_srcdir)) {
 	o "$v=\@$v@\n";
     }
-    o "MAKEFILES :=\n";
+    o "SUBDIRMK_MAKEFILES :=\n";
     o "MAKEFILE_TEMPLATES :=\n";
     o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
     foreach my $subdir (@subdirs) {