-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
+ttfsupport/all-google: ttfsupport/droidsans.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/notosans.inc.pl ttfsupport/notoserif.inc.pl
+ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl ttfsupport/freesans.inc.pl ttfsupport/freeserif.inc.pl
+
+#ttfsupport/unifont.inc.pl: tools/mkttfinfo
+# $< unifont.ttf $@
+# $< --headless unifont_upper.ttf >>$@
+
+unicode-cover.inc.pl: tools/mkfontinfo ttfsupport $(patsubst data/font/%.ttf,ttfsupport/%.inc.pl,$(wildcard data/font/*.ttf))