WIP NEW STYLE

diff --git a/NOTES b/NOTES
new file mode 100644 (file)
index 0000000..b202381
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,24 @@
+&=             =>      subdir
+&_             =>      subdir_
+&/             =>      subdir/
+&CAPS          =>      subdir_CAPS
+&lc            =>      subdir/lc
+
+&.= &._ &./ &.CAPS &.lc        =>      $(top_srcdir)/subdir
+&:= &:_ &:/ &:CAPS &:lc        =>      $(abs_top_srcdir)/subdir
+& thing thing          =>      like &thing &thing (until EOL)
+
+&&             =>      &
+
+&! spc         disables & *until* EOL
+
+&!STUFF                STUFF is recognised instead of & (beyond EOL)
+               STUFF is either all punct or all alphanum (incl _)
+               any lwsp after STUFF is discarded too
+eg notably
+ STUFF!&               now & is recognised instead (ie back to normal)
+ STUFFSTUFF    STUFF
+
+eg
+ &!@@@         @@@ is recognised instead of &
+ @@@!&         go back to &

diff --git a/lib/Subdir.mk.in b/lib/Subdir.mk.in
index eba1ce1429b10ad19c00ac0f2c25cd3c662acc23..8dd75e1a330b6d00939d383b263c9f6489219a3d 100644 (file)
--- a/lib/Subdir.mk.in
+++ b/lib/Subdir.mk.in
@@ -3,6 +3,7 @@
 ### Build script for library
 ###
 ### (c) 2019 Mark Wooding
+### (c) 2019 Ian Jackson
 ###
 
 ###----- Licensing notice ---------------------------------------------------
@@ -22,16 +23,9 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 
-$D/all:: $D/libtoy.a
-$D_CLEANFILES          :=
+&TARGETS_all   += & libtoy.a
 
-libtoy_SOURCES         := $(addprefix $D/, toylib.c)
-libtoy_OBJECTS         := $(call objects, $(libtoy_SOURCES))
-$(call notice-objects, $(libtoy_OBJECTS))
+&OBJECTS       += & toylib.c
 
-$D/libtoy.a: $(libtoy_OBJECTS)
-       $(call v-tag,AR)ar rc $@ $^
-$D_CLEANFILES          += $D/libtoy.a
-
-SUBDIRS                         = t
-$(call descend-subdirs, $(SUBDIRS))
+&libtoy.a:     $(&OBJECTS)
+       $(AR) rc $@ $^

diff --git a/lib/t/Subdir.mk.in b/lib/t/Subdir.mk.in
index a35f479de19898404252f216fc862f608ff0fa06..a5efee561681282828c5d05ae92914c9738622bf 100644 (file)
--- a/lib/t/Subdir.mk.in
+++ b/lib/t/Subdir.mk.in
@@ -3,6 +3,7 @@
 ### Build script for library test
 ###
 ### (c) 2019 Mark Wooding
+### (c) 2019 Ian Jackson
 ###
 
 ###----- Licensing notice ---------------------------------------------------
@@ -22,20 +23,16 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 
-$D_CLEANFILES          :=
+&TARGETS_check += & toytest.stamp
 
-$D/check:: $D/toytest.stamp
+&OBJECTS       += & toytest.o
+&LIBS          += lib/libtoy.a
 
-toytest_SOURCES                := $(addprefix $D/, toytest.c)
-toytest_OBJECTS                := $(call objects, $(toytest_SOURCES))
-toytest_LIBS            = lib/libtoy.a
-$(call notice-objects, $(toytest_OBJECTS))
+&CLEAN         += & toytest
 
-$D/toytest: $(toytest_OBJECTS) $(toytest_LIBS)
+&toytest:      $(&OBJECTS) $(&LIBS)
        $(LINK) $^
-$D_CLEANFILES          += $D/toytest
 
-$D/toytest.stamp: $D/toytest
+&toytest.stamp: & toytest
        $<
        touch $@
-$D_CLEANFILES          += $D/toytest.stamp

diff --git a/src/Subdir.mk.in b/src/Subdir.mk.in
index 8c9acd47d6bac46581368052fdc1539a475e920c..462bd37cd3deb3bb16d73a5fbea5fb02e46465ae 100644 (file)
--- a/src/Subdir.mk.in
+++ b/src/Subdir.mk.in
@@ -3,6 +3,7 @@
 ### Build script for main program
 ###
 ### (c) 2019 Mark Wooding
+### (c) 2019 Ian Jackson
 ###
 
 ###----- Licensing notice ---------------------------------------------------
@@ -22,14 +23,10 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 
-$D/all:: $D/toy
-$D_CLEANFILES          :=
+&TARGETS_all   += & toy
 
-toy_SOURCES            := $(addprefix $D/, toy.c)
-toy_OBJECTS            := $(call objects, $(toy_SOURCES))
-toy_LIBS                = lib/libtoy.a
-$(call notice-objects, $(toy_OBJECTS))
+&OBJECTS       += & toy.o
+&LIBS          += lib/libtoy.a
 
-$D/toy: $(toy_OBJECTS) $(toy_LIBS)
+&toy: $(&OBJECTS) $(&LIBS)
        $(LINK) $^
-$D_CLEANFILES          += $D/toy