X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=lib%2FSubdir.mk.in;h=03d1359092b038933565a9633524f7e449814b9b;hp=eba1ce1429b10ad19c00ac0f2c25cd3c662acc23;hb=c67dc7a0d79b065d135498cb06429c00bd90ad74;hpb=b1366586cbafe307ffca460f8f3034668c8e0969

diff --git a/lib/Subdir.mk.in b/lib/Subdir.mk.in
index eba1ce1..03d1359 100644
--- 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	+= & libtoy.a
 
-libtoy_SOURCES		:= $(addprefix $D/, toylib.c)
-libtoy_OBJECTS		:= $(call objects, $(libtoy_SOURCES))
-$(call notice-objects, $(libtoy_OBJECTS))
+&OBJECTS	+= & toylib.o
 
-$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 $@ $^