X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fgenerate;h=6ce18f96d88d55535f830126662e1751536a0aa6;hp=3208c8d9b333b0ec47355342c244fbd2ce994e5c;hb=f5ac12b12476ff3155665bc07344467f4741ab27;hpb=9afe863051fe0ae9d2d4e88db5fd95071fb9e7c4

diff --git a/subdirmk/generate b/subdirmk/generate
index 3208c8d..6ce18f9 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -3,10 +3,10 @@
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
 # generates in each subdirectory	from in each subdirectory
-#     Subdir.mk.tmp			    Subdir.mk.in
+#     Subdir.mk.tmp			    Subdir.sd.mk
 #     Makefile
 # and in toplevel			and in toplevel
-#     main.mk.tmp			    Perdir.mk.in
+#     main.mk.tmp			    Perdir.sd.mk
 
 use strict;
 use POSIX;
@@ -109,8 +109,8 @@ sub process_input_mk ($$$$$$$$) {
 	$var_prefix, $targets,
 	$f, $esclitr, $enoent_ok) = @_;
 
-    my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
-    my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
+    my $caps_re = qr{[A-Z]};
+    my $lc_re = qr{[a-z]};
 
     my $esc;
     my $set_esc = sub {
@@ -124,6 +124,8 @@ sub process_input_mk ($$$$$$$$) {
 	die "open $f: $!\n" unless $!==ENOENT && $enoent_ok;
 	return;
     }
+    o "MAKEFILE_TEMPLATES += $f\n";
+
     while (<$input>) {
 	if (s#^\s*$esc\:##) {
 	    $buffering_output='';
@@ -173,7 +175,6 @@ sub process_input_mk ($$$$$$$$) {
 	    $buffering_output=undef;
 	    if (m#^(-?)include\s+(\S+)\s+$#) {
 		my $subf = "$srcdir/$2";
-		o "MAKEFILE_TEMPLATES += $subf\n";
 		process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 				 $var_prefix, $targets,
 				 $subf, $esclitr, $subf);
@@ -195,12 +196,15 @@ sub filter_subdir_mk ($$$$$) {
     #print STDERR "filter @_\n";
 
     my $esclit = '&';
-    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
-	       "${srcdir}/Perdir.mk.in") {
+
+    my $pi = sub {
+	my ($f, $enoentok) = @_;
 	process_input_mk($dir_prefix, $dir_suffix, $dir_name,
 			 $var_prefix, $targets,
-			 $f, \$esclit, 0);
-    }
+			 "${srcdir}/$f", \$esclit, $enoentok);
+    };
+    $pi->("${dir_prefix}Subdir.sd.mk", 0);
+    $pi->("Perdir.sd.mk",              1);
 }
 
 sub process_subtree ($$);
@@ -237,7 +241,7 @@ sub process_subtree ($$) {
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
 	my $target_varname = target_varname($var_prefix, $target);
-	print O "${dir_prefix}${target}: \$($target_varname)";
+	print O "${dir_prefix}${target}:: \$($target_varname)";
 	foreach my $child_subdir (@{ $targets{$target} }) {
 	    print O " $child_subdir/$target";
 	}