X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/65d4676373dbb0a9f9c147e0de61eb66e595b91a..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index f48ffa7..df6cbe5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ 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)
+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)
@@ -30,7 +30,7 @@ word/put.js: $(download)
 word/%.min.js: word/%.js
 	uglifyjs -m '' $< -o $@
 
-data: data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.inc.pl data/unicode-sampler word
+data: data/digraphs.json data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.json data/unicode-sampler word
 
 data/DerivedAge.txt: $(download)
 	tools/wget-ifmodified http://www.unicode.org/Public/UNIDATA/$(@F) $@
@@ -48,8 +48,12 @@ data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
 	$(call cmdsave,$^)
 
 data/xorg-compose: $(download)
-	tools/wget-ifmodified http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre $@
-data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/lib/libx11/-/raw/master/nls/en_US.UTF-8/Compose.pre $@
+data/keysymdef.h: $(download)
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/proto/xorgproto/-/raw/master/include/X11/$(@F) $@
+data/keysymdef.json: tools/mkxkeysymdef data/keysymdef.h
+	$(call cmdsave,$^)
+data/digraphs-xorg.json: tools/mkdigraphs-xorg data/xorg-compose data/keysymdef.json
 	$(call cmdsave,$^)
 
 data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
@@ -60,7 +64,7 @@ data/digraphs-plan9.txt:
 data/digraphs-plan9.inc.pl: tools/mkdigraphs-plan9 data/digraphs-plan9.txt
 	$(call cmdsave,$^)
 
-data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
+data/digraphs.json: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
 	$(call cmdsave,$<)
 
 data/unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl data/unicode-age.inc.pl unicode-table.inc.pl
@@ -86,9 +90,9 @@ data/wordlist.version.txt: force
 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 >$@
@@ -152,7 +156,7 @@ data/browser/usage-wm.inc.pl: tools/mkusage-wikimedia data/browser/usage-wm.tsv
 	$(call cmdsave,$^)
 
 clean:
-	-rm data/digraphs.inc.pl
+	-rm data/digraphs.json
 	-rm data/unicode-char.inc.pl
 	-rm data/unicode-age.inc.pl
 	-rm -rf data/font/