X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=dd6df29451ba1327f63055f57945c007a73aa566;hp=c17d5f7d70e3ae848b84a6df77498108a4b6e1f0;hb=ad2d261d58a7718898ef7146d37b9c4b8e9083ca;hpb=e637ec96e688439ca41a25fb09e11a958180ba75

diff --git a/generate b/generate
index c17d5f7..dd6df29 100755
--- a/generate
+++ b/generate
@@ -114,10 +114,10 @@ Makefile run-main.mk:
 END
 }
 
-sub process_input_mk ($$$$$$$$);
-sub process_input_mk ($$$$$$$$) {
+sub process_input_mk ($$$$$$$$$);
+sub process_input_mk ($$$$$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-	$var_prefix, $targets,
+	$var_prefix, $var_prefix_name, $targets,
 	$f, $esclitr, $enoent_ok) = @_;
 
     my $caps_re = qr{[A-Z]};
@@ -137,22 +137,25 @@ sub process_input_mk ($$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %srcdirmap = (
+		  '^' => "\$(top_srcdir)${dir_suffix}",
+		  '~' => "\$(top_srcdir)",
+		    );
     my %pfxmap = (
 		  ''  => $dir_prefix,
-		  '^' => "\$(top_srcdir)${dir_suffix}/",
-		  '~' => "\$(top_srcdir)/",
 		 );
+    $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $buffering_output='';
 	}
 	for (;;) {
-	    unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
+	    unless (s{^(.*?)$esc}{}) { o $_; last; }
 	    o $1;
-	    if ($2) { s#^$esc##; o $$esclitr; next; }
-	    s{^$esc}{} or die "$_ ?";
-	    if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
+	    if (s{^\\$esc}{}) { o "$$esclitr" }
+	    elsif (s{^\\\$}{}) { o '$' }
+	    elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
 	    elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
 		my $t = $1 // 'all';
 		o target_varname($var_prefix, $t);
@@ -161,9 +164,10 @@ sub process_input_mk ($$$$$$$$) {
 	    elsif (m{^(?=$caps_re)}) { o $var_prefix }
 	    elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
 	    elsif (s{^_}{}) { o $var_prefix }
-	    elsif (s{^=_}{}) { o $var_prefix }
+	    elsif (s{^=}{}) { o $var_prefix_name }
 	    elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
-	    elsif (s{^=/}{}) { o $dir_name }
+	    elsif (s{^\.}{}) { o $dir_name }
+	    elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} }
 	    elsif (s{^([~^]?)(?=[ \t])}{}) {
 		my $prefix = $pfxmap{$1} // die;
 		my $after='';
@@ -176,9 +180,6 @@ sub process_input_mk ($$$$$$$$) {
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
-	    } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-		$$esclitr = $1;
-		$set_esc->();
 	    } else {
 		die "bad escape $$esclitr$_ ";
 	    }
@@ -189,9 +190,12 @@ sub process_input_mk ($$$$$$$$) {
 	    if (m#^(-?)include\s+(\S+)\s+$#) {
 		my $subf = "$srcdir/$2";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-				 $var_prefix, $targets,
+				 $var_prefix, $var_prefix_name, $targets,
 				 $subf, $esclitr, $1);
 		o "\n";
+	    } elsif (m#^changequote\s+(\S+)\s+$#) {
+		$$esclitr = $1;
+		$set_esc->();
 	    } else {
 		die "unknown directive $_ ";
 	    }
@@ -201,9 +205,9 @@ sub process_input_mk ($$$$$$$$) {
     close $input or die "close $f: $!\n";
 }
 
-sub filter_subdir_mk ($$$$$) {
+sub filter_subdir_mk ($$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-	$var_prefix, $targets) = @_;
+	$var_prefix, $var_prefix_name, $targets) = @_;
 
     #use Data::Dumper;
     #print STDERR "filter @_\n";
@@ -213,7 +217,7 @@ sub filter_subdir_mk ($$$$$) {
     my $pi = sub {
 	my ($f, $enoentok) = @_;
 	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-			 $var_prefix, $targets,
+			 $var_prefix, $var_prefix_name, $targets,
 			 "${srcdir}/$f", \$esclit, $enoentok);
     };
     $pi->("${dir_prefix}Subdir.sd.mk", 0);
@@ -232,7 +236,8 @@ sub process_subtree ($$) {
     my $dir_prefix = join '', map { "$_/" } @$path;
     my $dir_suffix = join '', map { "/$_" } @$path;
     my $dir_name = join '/', @$path ? @$path : '.';
-    my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
+    my $var_prefix_name = join '_', @$path ? @$path : qw(TOP);
+    my $var_prefix = "${var_prefix_name}_";
 
     push @output_makefiles, "${dir_prefix}Subdir.mk";
     write_makefile($dir_prefix, scalar @$path);
@@ -249,7 +254,7 @@ sub process_subtree ($$) {
 
     if ($node->[2]) {
 	filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
-			 $var_prefix, \%targets);
+			 $var_prefix, $var_prefix_name, \%targets);
     } else {
 	my $sdmk = "${dir_prefix}Subdir.sd.mk";
 	if (stat $sdmk) {