-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 $@ || true
-ttfsupport/garamond.inc.pl: tools/mkttfinfo
- $< 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
- $< 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
- $< >$@
-
-data/countryInfo.txt:
+data/font/all: data/font/all-win2k data/font/all-dejavu data/font/all-google data/font/all-other
+data/font/all-win2k: data/font/verdana.win2k.inc.pl data/font/times.win2k.inc.pl data/font/arial.win2k.inc.pl data/font/cour.win2k.inc.pl data/font/comic.win2k.inc.pl data/font/georgia.win2k.inc.pl data/font/arialuni.inc.pl
+data/font/all-dejavu: data/font/dvsans.inc.pl data/font/dvserif.inc.pl data/font/dvmono.inc.pl
+data/font/all-google: data/font/droidsans.inc.pl data/font/droidserif.inc.pl data/font/droidmono.inc.pl data/font/roboto.inc.pl data/font/notosans.inc.pl data/font/notoserif.inc.pl
+data/font/all-other: data/font/unifont.inc.pl data/font/code2000.inc.pl data/font/freesans.inc.pl data/font/freeserif.inc.pl
+
+#data/font/unifont.inc.pl: tools/mkttfinfo
+# $< unifont.ttf $@
+# $< --headless unifont_upper.ttf >>$@
+
+data/unicode-cover.inc.pl: tools/mkfontinfo data/font # $(wildcard data/font/*.inc.pl)
+ $(call cmdsave,$<)
+
+data/countryInfo.txt: $(download)