subdirmk: Change stub force target to `run-main.mk'

[subdirmk.git] / generate

diff --git a/generate b/generate
index b4c52ae40073c1c3cca1b3026a2c52595e1d9851..dd22146339b130fc6ffbb7efdd9ab3ce0ccc8515 100755 (executable)
--- a/generate
+++ b/generate
@@ -99,12 +99,12 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
     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:
        \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
 .SUFFIXES:

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

 END
 }
 
 END
 }
 


@@ -133,8 +133,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 +153,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.$'); }