X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=generate;h=dd6df29451ba1327f63055f57945c007a73aa566;hp=14e18c0899a58c2a729d4e06bc398c4adbe1ba24;hb=ee295f5f320fc8db7f789da3198a751b1cc7ddd3;hpb=278e4ea0d803f3b603062d0b0fcd9a7f86ef0557 diff --git a/generate b/generate index 14e18c0..dd6df29 100755 --- a/generate +++ b/generate @@ -32,8 +32,8 @@ our @subdirs = @ARGV; s{/+$}{} foreach @subdirs; -our $root = [ '.', [ ] ]; -# each node is [ 'relative subdir name', \@children ] +our $root = [ '.', [ ], 1 ]; +# each node is [ 'relative subdir name', \@children, $mentioned ] sub build_tree () { foreach my $subdir (@subdirs) { @@ -47,6 +47,7 @@ sub build_tree () { } $node = $c; } + $node->[2] = 1; } } @@ -59,6 +60,7 @@ our $writing_output; our $buffering_output; our %output_files; our %input_files; +our @output_makefiles; sub close_any_output_file() { return unless defined $writing_output; @@ -97,21 +99,25 @@ 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 < "\$(top_srcdir)${dir_suffix}", + '~' => "\$(top_srcdir)", + ); + my %pfxmap = ( + '' => $dir_prefix, + ); + $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); $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 $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{^=}{}) { o $var_prefix_name } + elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} } + elsif (s{^\.}{}) { o $dir_name } + elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} } + elsif (s{^([~^]?)(?=[ \t])}{}) { + my $prefix = $pfxmap{$1} // die; my $after=''; if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); } s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g; @@ -170,9 +180,6 @@ sub process_input_mk ($$$$$$$$) { } elsif (s{^![ \t]+}{}) { o $_; $_ = ''; - } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) { - $$esclitr = $1; - $set_esc->(); } else { die "bad escape $$esclitr$_ "; } @@ -183,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 $_ "; } @@ -195,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"; @@ -207,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); @@ -226,8 +236,10 @@ 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); my %targets = (all => []); @@ -240,8 +252,18 @@ sub process_subtree ($$) { } start_output_file("${dir_prefix}Subdir.mk.tmp"); - filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name, - $var_prefix, \%targets); + if ($node->[2]) { + filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name, + $var_prefix, $var_prefix_name, \%targets); + } else { + my $sdmk = "${dir_prefix}Subdir.sd.mk"; + if (stat $sdmk) { + die "$sdmk unexpectedly exists (${dir_prefix} not mentioned)"; + } elsif ($!==ENOENT) { + } else { + die "stat $sdmk: $!"; + } + } o "\n"; @@ -254,6 +276,11 @@ sub process_subtree ($$) { } print O "\n"; } + if (@targets) { + print O ".PHONY:"; + print O " ${dir_prefix}${_}" foreach @targets; + print O "\n"; + } return @targets; } @@ -264,14 +291,15 @@ sub process_tree() { foreach my $v (qw(top_srcdir abs_top_srcdir)) { o "$v=\@$v@\n"; } - o "MAKEFILES += Subdir.mk\n"; - foreach my $subdir (@subdirs) { - o "MAKEFILES += $subdir/Subdir.mk\n"; + o "SUBDIRMK_MAKEFILES :=\n"; + o "MAKEFILE_TEMPLATES :=\n"; + foreach my $mf (@output_makefiles) { + o "SUBDIRMK_MAKEFILES += $mf\n"; } foreach my $input (sort keys %input_files) { o "MAKEFILE_TEMPLATES += $input\n"; } - o "include \$(MAKEFILES)"; + o "include \$(SUBDIRMK_MAKEFILES)\n"; } build_tree();