subdirmk: Go back to ^ and ~

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

diff --git a/mtest/Subdir.sd.mk b/mtest/Subdir.sd.mk
index 7c9953ecad132f9c7a1b3fd7d2bbab333d5c550a..bdb872fbfe6b6c885b6f4119290adc67cc05dd31 100644 (file)
--- a/mtest/Subdir.sd.mk
+++ b/mtest/Subdir.sd.mk
@@ -1,7 +1,7 @@
 
-&DEPS += $; make-secnet-sites
-&DEPS += $; ipaddrset.py
-&DEPS += &, common.tcl
+&DEPS += &~/make-secnet-sites
+&DEPS += &~/ipaddrset.py
+&DEPS += &^/common.tcl
 
 &:include test-common.sd.mk
 

diff --git a/stest/Subdir.sd.mk b/stest/Subdir.sd.mk
index 6eb32092fc0e3b14199a8d56c86d37828ee54688..9b953ad77138dca213f67851dd82b46c02da7463 100644 (file)
--- a/stest/Subdir.sd.mk
+++ b/stest/Subdir.sd.mk
@@ -2,7 +2,7 @@
 &TARGETS += & udp-preload.so
 
 &DEPS += & udp-preload.so
-&DEPS += &, common.tcl
+&DEPS += &^ common.tcl
 &DEPS += secnet
 &DEPS += test-example/sites.conf
 &DEPS += test-example/inside.key

diff --git a/subdirmk/example/Subdir.sd.mk b/subdirmk/example/Subdir.sd.mk
index 162d7ce8a166beb152fa07a2edd3ad6ee7153237..5c2040a1b8f65b8ce848380a3ee3c7fd7a688029 100644 (file)
--- a/subdirmk/example/Subdir.sd.mk
+++ b/subdirmk/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/subdirmk/example/lib/Subdir.sd.mk b/subdirmk/example/lib/Subdir.sd.mk
index 8ac946dbc616b2e95c6bb74579e6eef053fb7a0e..c2939c54457ebe992e86b2a244e0550391d4aab4 100644 (file)
--- a/subdirmk/example/lib/Subdir.sd.mk
+++ b/subdirmk/example/lib/Subdir.sd.mk
@@ -10,4 +10,4 @@
 &libtoy.a:     $(&OBJECTS)
        $(AR) rc $@ $^
 
--include &,for-test.mk
+-include &^/lib/for-test.mk

diff --git a/subdirmk/generate b/subdirmk/generate
index b4c52ae40073c1c3cca1b3026a2c52595e1d9851..f46747da641acb3e0bb1847af7714fe548dceb19 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -133,8 +133,8 @@ sub process_input_mk ($$$$$$$$) {
 
     my %pfxmap = (
                  ''  => $dir_prefix,
-                 ',' => "\$(top_srcdir)${dir_suffix}/",
-                 ';' => "\$(top_srcdir)/",
+                 '^' => "\$(top_srcdir)${dir_suffix}/",
+                 '~' => "\$(top_srcdir)/",
                 );
 
     while (<$input>) {
@@ -153,12 +153,12 @@ sub process_input_mk ($$$$$$$$) {
                $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 $pfxmap{$1} }
+           elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
            elsif (s{^=/}{}) { o $dir_name }
-           elsif (s{^([,;]?)(?=[ \t])}{}) {
+           elsif (s{^([~^]?)(?=[ \t])}{}) {
                my $prefix = $pfxmap{$1} // die;
                my $after='';
                if (m{([ \t])$esc}) { ($_,$after) = ($`, $1.$'); }

diff --git a/test-common.sd.mk b/test-common.sd.mk
index b830264e55908b3998b3079bf24e1b4e2a84ef9a..0584a98ba00799d3e7103e9cdb2be91d7e0d3d03 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,7 +1,7 @@
 
 include common.make
 
-&TESTSCRIPTS ?= $(shell echo &,t-*[0-9a-z])
+&TESTSCRIPTS ?= $(shell echo &^/t-*[0-9a-z])
 &TESTNAMES := $(patsubst t-%,%,$(notdir $(&TESTSCRIPTS)))
 
 &DEPS += $(src)/test-common.tcl
@@ -15,7 +15,7 @@ include common.make
 
 CHECK_SILENT ?= @
 
-&d-%/ok: &,t-% $(&DEPS)
+&d-%/ok: &^/t-% $(&DEPS)
        $(CHECK_SILENT) rm -rf &d-$*; mkdir &d-$*
        $(CHECK_SILENT) export SECNET_TEST_BUILDDIR=$(topbuilddir); \
         export PYTHONBYTECODEBASE=/dev/null; \

diff --git a/test-example/Subdir.sd.mk b/test-example/Subdir.sd.mk
index 835aab6e814b6004203efa35dcda4c44137dde0f..66cdaf80b13e7946b250e987a409744e23065b90 100644 (file)
--- a/test-example/Subdir.sd.mk
+++ b/test-example/Subdir.sd.mk
@@ -2,11 +2,11 @@
 
 include common.make
 
-&/%.key: &,/%.key.b64
+&/%.key: &^/%.key.b64
        base64 -d <$< >$@.new && mv -f $@.new $@
 
-&sites.conf: $(src)/make-secnet-sites &,sites Subdir.mk
-       $(src)/make-secnet-sites &,sites &sites.conf
+&sites.conf: $(src)/make-secnet-sites &^/sites Subdir.mk
+       $(src)/make-secnet-sites &^/sites &sites.conf
 
 &clean::
        rm -f *~ ./#*# *.new