digraphs: intermediate parse of shiar.inc.txt proposals

[sheet.git] / Makefile

diff --git a/Makefile b/Makefile
index b12614a301d849454c5d587d7405fe4146139b16..6314e18f154cd29d25ddcc43d0a0e2005d7a74e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,15 @@ 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,$^) >$@
 
+data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
+       $< $(word 2,$^) >$@
+
+digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl
+       $< >$@
+
 unicode-char.inc.pl: tools/mkcharinfo digraphs.inc.pl unicode-age.inc.pl
        $< >$@
 
@@ -43,9 +49,9 @@ 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/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
 ttfsupport/dvsans.inc.pl: tools/mkttfinfo