X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/fce33dd3347984d52ab27fff3eb25dd324d7f587..3910a1c4f5cd82cdcee45c0423f3f264e332b2a8:/Makefile

diff --git a/Makefile b/Makefile
index b12614a..d0ea050 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: unicode-char.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser/support.inc.pl
+all: digraphs.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser/support.inc.pl
 
 download: data/DerivedAge.txt data/rfc1345.txt data/countryInfo.txt data/caniuse.json
 .PHONY: download
@@ -12,10 +12,19 @@ unicode-age.inc.pl: tools/mkcharver data/DerivedAge.txt
 data/rfc1345.txt:
 	tools/wget-ifmodified http://www.ietf.org/rfc/$(@F) $@
 
-digraphs.inc.pl: tools/mkdigraphlist data/rfc1345.txt shiar.inc.txt
+data/digraphs-rfc.inc.pl: tools/mkdigraphs-rfc data/rfc1345.txt
 	$< $(word 2,$^) >$@
 
-unicode-char.inc.pl: tools/mkcharinfo digraphs.inc.pl unicode-age.inc.pl
+data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
+	$< $(word 2,$^) >$@
+
+data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
+	$< >$@
+
+digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl unicode-char.inc.pl
+	$< >$@
+
+unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-age.inc.pl
 	$< >$@
 
 ttfsupport: tools/mkttfinfo
@@ -43,9 +52,11 @@ ttfsupport/arialuni.inc.pl: tools/mkttfinfo
 
 ttfsupport/all-apple: ttfsupport/lucida.inc.pl ttfsupport/garamond.inc.pl
 ttfsupport/lucida.inc.pl: tools/mkttfinfo
-	$< Lucida\?Grande.ttf $@
+	$< Lucida\?Grande.ttf $@ || true
 ttfsupport/garamond.inc.pl: tools/mkttfinfo
-	$< AppleGaramond.ttf $@
+	$< AppleGaramond.ttf $@ || true
+ttfsupport/opensans.inc.pl: tools/mkttfinfo
+	$< opensans.ttf $@ || true
 
 ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
 ttfsupport/dvsans.inc.pl: tools/mkttfinfo