subdirmk: Implement new syntax

But I plan to go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/example/Subdir.sd.mk b/example/Subdir.sd.mk
index 5c2040a1b8f65b8ce848380a3ee3c7fd7a688029..162d7ce8a166beb152fa07a2edd3ad6ee7153237 100644 (file)
--- a/example/Subdir.sd.mk
+++ b/example/Subdir.sd.mk
@@ -3,7 +3,7 @@
 #  Copyright 2019 Ian Jackson
 # SPDX-License-Identifier: LGPL-2.0-or-later
 
-INCLUDES       += -I&^/lib/
+INCLUDES       += -I&;lib/
 
 include subdirmk/usual.mk
 include subdirmk/regen.mk

diff --git a/example/lib/Subdir.sd.mk b/example/lib/Subdir.sd.mk
index c2939c54457ebe992e86b2a244e0550391d4aab4..8ac946dbc616b2e95c6bb74579e6eef053fb7a0e 100644 (file)
--- a/example/lib/Subdir.sd.mk
+++ b/example/lib/Subdir.sd.mk
@@ -10,4 +10,4 @@
 &libtoy.a:     $(&OBJECTS)
        $(AR) rc $@ $^
 
--include &^/lib/for-test.mk
+-include &,for-test.mk

diff --git a/generate b/generate
index 0bb4b7b3501014b9696e782b95c3186494113c51..b4c52ae40073c1c3cca1b3026a2c52595e1d9851 100755 (executable)
--- a/generate
+++ b/generate
@@ -131,6 +131,12 @@ sub process_input_mk ($$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %pfxmap = (
+                 ''  => $dir_prefix,
+                 ',' => "\$(top_srcdir)${dir_suffix}/",
+                 ';' => "\$(top_srcdir)/",
+                );
+
     while (<$input>) {
        if (s#^\s*$esc\:##) {
            $buffering_output='';
@@ -147,19 +153,13 @@ sub process_input_mk ($$$$$$$$) {
                $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 $pfxmap{$1} }
            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{^([,;]?)(?=[ \t])}{}) {
+               my $prefix = $pfxmap{$1} // die;
                my $after='';
                if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }
                s{(?<=[ \t])(?=\S)(?!\\\s*$)}{$prefix}g;