generate: Track output Makefiles properly

[subdirmk.git] / generate

diff --git a/generate b/generate
index b4c52ae40073c1c3cca1b3026a2c52595e1d9851..c17d5f7d70e3ae848b84a6df77498108a4b6e1f0 100755 (executable)
--- a/generate
+++ b/generate
@@ -32,8 +32,8 @@ our @subdirs = @ARGV;
 
 s{/+$}{} foreach @subdirs;
 
 
 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) {
 
 sub build_tree () {
     foreach my $subdir (@subdirs) {


@@ -47,6 +47,7 @@ sub build_tree () {
            }
            $node = $c;
        }
            }
            $node = $c;
        }

+       $node->[2] = 1;

     }
 }
 
     }
 }
 


@@ -59,6 +60,7 @@ our $writing_output;
 our $buffering_output;
 our %output_files;
 our %input_files;
 our $buffering_output;
 our %output_files;
 our %input_files;

+our @output_makefiles;

 
 sub close_any_output_file() {
     return unless defined $writing_output;
 
 sub close_any_output_file() {
     return unless defined $writing_output;


@@ -97,14 +99,18 @@ sub write_makefile ($$) {
     #print STDERR "write_makefile @_\n";
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     #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
     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:
 .SUFFIXES:

-.PHONY:        FORCE-ALWAYS-RUN
+.PHONY:        run-main.mk

 END
 }
 
 END
 }
 


@@ -133,8 +139,8 @@ sub process_input_mk ($$$$$$$$) {
 
     my %pfxmap = (
                  ''  => $dir_prefix,
 
     my %pfxmap = (
                  ''  => $dir_prefix,

-                 ',' => "\$(top_srcdir)${dir_suffix}/",
-                 ';' => "\$(top_srcdir)/",
+                 '^' => "\$(top_srcdir)${dir_suffix}/",
+                 '~' => "\$(top_srcdir)/",

                 );
 
     while (<$input>) {
                 );
 
     while (<$input>) {


@@ -153,12 +159,12 @@ sub process_input_mk ($$$$$$$$) {
                $targets->{$t} //= [ ];
            }
            elsif (m{^(?=$caps_re)}) { o $var_prefix }
                $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 $var_prefix }
            elsif (s{^=_}{}) { o $var_prefix }

-           elsif (s{^([,;]?)/}{}) { o $pfxmap{$1} }
+           elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }

            elsif (s{^=/}{}) { o $dir_name }
            elsif (s{^=/}{}) { o $dir_name }

-           elsif (s{^([,;]?)(?=[ \t])}{}) {
+           elsif (s{^([~^]?)(?=[ \t])}{}) {

                my $prefix = $pfxmap{$1} // die;
                my $after='';
                if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
                my $prefix = $pfxmap{$1} // die;
                my $after='';
                if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }


@@ -228,6 +234,7 @@ sub process_subtree ($$) {
     my $dir_name = join '/', @$path ? @$path : '.';
     my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
 
     my $dir_name = join '/', @$path ? @$path : '.';
     my $var_prefix = join '', map { "${_}_" } @$path ? @$path : qw(TOP);
 

+    push @output_makefiles, "${dir_prefix}Subdir.mk";

     write_makefile($dir_prefix, scalar @$path);
 
     my %targets = (all => []);
     write_makefile($dir_prefix, scalar @$path);
 
     my %targets = (all => []);


@@ -240,8 +247,18 @@ sub process_subtree ($$) {
     }
     start_output_file("${dir_prefix}Subdir.mk.tmp");
 
     }
     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, \%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";
 
 
     o "\n";
 


@@ -254,6 +271,11 @@ sub process_subtree ($$) {
        }
        print O "\n";
     }
        }
        print O "\n";
     }

+    if (@targets) {
+       print O ".PHONY:";
+       print O " ${dir_prefix}${_}" foreach @targets;
+       print O "\n";
+    }

 
     return @targets;
 }
 
     return @targets;
 }


@@ -266,14 +288,13 @@ sub process_tree() {
     }
     o "SUBDIRMK_MAKEFILES :=\n";
     o "MAKEFILE_TEMPLATES :=\n";
     }
     o "SUBDIRMK_MAKEFILES :=\n";
     o "MAKEFILE_TEMPLATES :=\n";

-    o "SUBDIRMK_MAKEFILES += Subdir.mk\n";
-    foreach my $subdir (@subdirs) {
-       o "SUBDIRMK_MAKEFILES += $subdir/Subdir.mk\n";
+    foreach my $mf (@output_makefiles) {
+       o "SUBDIRMK_MAKEFILES += $mf\n";

     }
     foreach my $input (sort keys %input_files) {
        o "MAKEFILE_TEMPLATES += $input\n";
     }
     }
     foreach my $input (sort keys %input_files) {
        o "MAKEFILE_TEMPLATES += $input\n";
     }

-    o "include \$(SUBDIRMK_MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)\n";

 }
 
 build_tree();
 }
 
 build_tree();