font: replace convert-allfonts by make rules

diff --git a/Makefile b/Makefile
index 5fb160ce07a8bc8f4347f354b17c45a9004b568d..b12614a301d849454c5d587d7405fe4146139b16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,61 @@ digraphs.inc.pl: tools/mkdigraphlist data/rfc1345.txt shiar.inc.txt
 unicode-char.inc.pl: tools/mkcharinfo digraphs.inc.pl unicode-age.inc.pl
        $< >$@
 
-ttfsupport: tools/convert-allfonts
+ttfsupport: tools/mkttfinfo
        mkdir -p $@
-       $<
+       $(MAKE) ttfsupport/all
+       touch $@
+
+ttfsupport/all: ttfsupport/all-ms ttfsupport/all-apple ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/unifont.inc.pl ttfsupport/c2k.inc.pl
+
+ttfsupport/all-ms: ttfsupport/verdana.inc.pl ttfsupport/times.inc.pl ttfsupport/arial.inc.pl ttfsupport/courier.inc.pl ttfsupport/comic.inc.pl ttfsupport/georgia.inc.pl ttfsupport/arialuni.inc.pl
+ttfsupport/verdana.inc.pl: tools/mkttfinfo
+       $< Verdana.ttf $@
+ttfsupport/times.inc.pl: tools/mkttfinfo
+       $< Times_New_Roman.ttf $@
+ttfsupport/arial.inc.pl: tools/mkttfinfo
+       $< Arial.ttf $@
+ttfsupport/courier.inc.pl: tools/mkttfinfo
+       $< Courier_New.ttf $@
+ttfsupport/comic.inc.pl: tools/mkttfinfo
+       $< Comic_Sans_MS.ttf $@
+ttfsupport/georgia.inc.pl: tools/mkttfinfo
+       $< Georgia.ttf $@
+ttfsupport/arialuni.inc.pl: tools/mkttfinfo
+       $< 'arial*uni*.ttf' $@
+
+ttfsupport/all-apple: ttfsupport/lucida.inc.pl ttfsupport/garamond.inc.pl
+ttfsupport/lucida.inc.pl: tools/mkttfinfo
+       $< Lucida\?Grande.ttf $@
+ttfsupport/garamond.inc.pl: tools/mkttfinfo
+       $< AppleGaramond.ttf $@
+
+ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
+ttfsupport/dvsans.inc.pl: tools/mkttfinfo
+       $< DejaVuSans.ttf $@
+ttfsupport/dvserif.inc.pl: tools/mkttfinfo
+       $< DejaVuSerif.ttf $@
+ttfsupport/dvmono.inc.pl: tools/mkttfinfo
+       $< DejaVuSansMono.ttf $@
+
+ttfsupport/all-google: ttfsupport/droid.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/noto.inc.pl ttfsupport/notoserif.inc.pl
+ttfsupport/droid.inc.pl: tools/mkttfinfo
+       $< DroidSans.ttf $@
+ttfsupport/droidserif.inc.pl: tools/mkttfinfo
+       $< DroidSerif-Regular.ttf $@
+ttfsupport/droidmono.inc.pl: tools/mkttfinfo
+       $< DroidSansMono.ttf $@
+ttfsupport/roboto.inc.pl: tools/mkttfinfo
+       $< Roboto-Regular.ttf $@
+ttfsupport/noto.inc.pl: tools/mkttfinfo
+       $< NotoSans-Regular.ttf $@
+ttfsupport/notoserif.inc.pl: tools/mkttfinfo
+       $< NotoSerif-Regular.ttf $@
+
+ttfsupport/unifont.inc.pl: tools/mkttfinfo
+       $< unifont.ttf $@
+ttfsupport/c2k.inc.pl: tools/mkttfinfo
+       $< code2000.ttf $@
 
 unicode-cover.inc.pl: tools/mkfontinfo ttfsupport
        $< >$@

diff --git a/tools/convert-allfonts b/tools/convert-allfonts
deleted file mode 100755 (executable)
index 74d2518..0000000
--- a/tools/convert-allfonts
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-set -u
-
-cd $(dirname "$0")
-
-CONVBIN=./mkttfinfo
-OUTDIR=../ttfsupport
-
-convfont () {
-       $CONVBIN "$1" $OUTDIR/$2.inc.pl
-}
-
-# /usr/share/fonts/truetype/msttcorefonts
-convfont Verdana.ttf verdana
-convfont Times_New_Roman.ttf times
-convfont Arial.ttf arial
-convfont Courier_New.ttf courier
-convfont Comic_Sans_MS.ttf comic
-convfont Georgia.ttf georgia
-
-convfont 'arial*uni*.ttf' ariuni
-
-# ../data/macfonts
-convfont Lucida\?Grande.ttf lucida
-convfont AppleGaramond.ttf garamond
-
-# /usr/share/fonts/truetype/ttf-dejavu
-convfont DejaVuSans.ttf dvsans
-convfont DejaVuSerif.ttf dvserif
-convfont DejaVuSansMono.ttf dvmono
-
-# /usr/share/fonts/truetype/droid
-convfont DroidSans.ttf droid
-convfont DroidSerif.ttf droidserif
-convfont DroidSansMono.ttf droidmono
-# /usr/share/fonts/truetype/roboto
-convfont Roboto-Regular.ttf roboto
-# /usr/share/fonts/truetype/noto
-convfont NotoSans-Regular.ttf noto
-convfont NotoSerif-Regular.ttf notoserif
-
-# /usr/share/fonts/truetype/unifont
-convfont unifont.ttf unifont
-
-convfont code2000.ttf c2k
-