X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d66fb2e242cd73e7a3b5c3980d7491080fc5f8d1..e6b10645e7470208f5122055489c7a19733e50bc:/Makefile

diff --git a/Makefile b/Makefile
index 7d1e2e3..806e5be 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ plan.plp: TODO
 UPDATE: $(download)
 	$(call cmdsave,git log -1 --date=short --pretty="%ad	%s")
 
-cache: $(patsubst %.inc.pl,data/%.json,$(wildcard charset-*.inc.pl) writing-latn.inc.pl)
-word: word/put.min.js data/wordlist.inc.pl data/wordlist.en.json data/wordlist.nl.json data/wordlist.ru.json data/wordpairs.json
+cache: $(patsubst %.inc.pl,data/%.json,$(wildcard charset-*.inc.pl) $(wildcard keyboard/altgr/*.inc.pl) writing-latn.inc.pl)
+word: word/put.min.js data/wordlist.en.json data/wordlist.nl.json data/wordlist.ru.json data/wordpairs.json
 
 word/put.js: $(download)
 	tools/wget-ifmodified https://github.com/kriszyp/put-selector/raw/master/put.js $@
@@ -83,14 +83,12 @@ data/wordlist.version.txt: force
 	@[ -e $@ ] || date -Is >$@
 	tools/lastword $@ || true
 
-data/wordlist.inc.pl: tools/mkwordlist data/wordlist.version.txt
-	$(call cmdsave,$<)
 data/wordlist.%.inc.pl: tools/mkwordlist data/wordlist.version.txt
 	$(call cmdsave,$< $*)
 data/word%.json: data/word%.inc.pl
-	$(call cmdsave,perl -MJSON=encode_json -E "print encode_json(do \$$ARGV[0])" ./$<)
+	$(call cmdsave,tools/mkjson $<)
 data/%.json: %.inc.pl
-	$(call cmdsave,perl -MJSON -E "print JSON->new->utf8->canonical->encode(do \$$ARGV[0])" ./$<)
+	$(call cmdsave,tools/mkjson $<)
 
 data/wordpairs.inc.pl: data/wordlist.version.txt
 	tools/wordpairs >$@