X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1dee8e5f63eb2019ae3492931cd999593b63991d..254f395a864dea55080e1ce4f9f0f3dab55af475:/Makefile

diff --git a/Makefile b/Makefile
index 1f48304..20458be 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
 
 data/wordlist.version.txt: force
 	@[ -e $@ ] || date -Is >$@
-	@perl -ni -I. -MShiar_Sheet::DB -E 'say (Shiar_Sheet::DB->connect->select(word => "max(updated)", \["updated>?", $$_])->list or exit 1)' $@ || true
+	tools/lastword $@ || true
 
 data/wordlist.inc.pl: tools/mkwordlist data/wordlist.version.txt
 	$(call cmdsave,$<)
@@ -92,7 +92,7 @@ data/%.json: %.inc.pl
 	$(call cmdsave,perl -MJSON -E "print JSON->new->utf8->canonical->encode(do \$$ARGV[0])" ./$<)
 
 data/wordpairs.inc.pl: data/wordlist.version.txt
-	@perl -I. -MShiar_Sheet::DB -MData::Dump=pp -E 'say pp(Shiar_Sheet::DB->connect->select("word w JOIN word a ON w.id=a.ref" => "w.id, a.id", {"a.lang"=>undef})->map or exit 1)' >$@
+	tools/wordpairs >$@
 
 .SECONDARY: data/font/%.ttf
 data/font/%.ttf: