From 0c7ad993f7f8cffcc3972a6f8e5517fd841051b5 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Thu, 25 Jul 2024 16:48:42 -0400
Subject: fonts: much progress.

---
 Makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f8b5161..186a5e1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ MAN7DIR=$(MANDIR)/man7
 DOCDIR=$(PREFIX)/share/doc/bw-atari8-tools
 PSFDIR=$(PREFIX)/share/kbd/consolefonts
 BDFDIR=$(PREFIX)/share/share/fonts/misc
+TTFDIR=$(PREFIX)/share/share/fonts/TTF
 
 # Compiler stuff
 COPT=-O2
@@ -26,6 +27,7 @@ MAN7S=atascii.7 fauxtari.7
 DOCS=README.txt equates.inc *.dasm LICENSE ksiders/atr.txt
 PSFS=fonts/fauxtari-8.psf fonts/fauxtari-16.psf fonts/fauxtari-24.psf
 BDFS=fonts/fauxtari-8.bdf fonts/fauxtari-16.bdf fonts/fauxtari-24.bdf
+TTF=fonts/FauxtariScalableMono.ttf
 
 SUBDIRS=ksiders jindroush
 
@@ -51,7 +53,7 @@ RST2MAN=rst2man
 # "make clean" and "make distclean" will not delete the 6502 object
 # code (the *.bin files), but "make realclean" will.
 
-all: $(BINS) manpages symlinks subdirs fonts/fauxtari-8.psf
+all: $(BINS) manpages symlinks subdirs $(TTF)
 
 unprotbas: bas.o
 
@@ -185,9 +187,12 @@ manpages: $(MANS) $(MAN5S) $(MAN7S)
 %.7: %.rst manhdr7.rst manftr.rst
 	$(RST2MAN) $< > $@
 
-fonts/fauxtari-8.psf: fonts/mkpsf.pl
+fonts/fauxtari-8.bdf: fonts/mkpsf.pl
 	( cd fonts && perl mkpsf.pl )
 
+$(TTF): fonts/fauxtari-8.bdf
+	bitmapfont2ttf --family-name "Fauxtari Scalable Mono" fonts/fauxtari-8.bdf $(TTF)
+
 # "make clean" does NOT remove the .bin or _bin.[ch] files. This is
 # for people who don't have either dasm or atasm installed.
 # also, it doesn't remove the man pages. these are checked into git, even.
@@ -239,13 +244,13 @@ install-subdirs: subdirs
 		make -C $$dir DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) BINDIR=$(BINDIR) MAN1DIR=$(MAN1DIR) GZIP_MAN=$(GZIP_MAN) DOCDIR=$(DOCDIR) install; \
 	done
 
-install-bdfs: all
-	sh install-bdf.sh $(BDFDIR)
+install-fonts: all
+	sh install-fonts.sh "$(DESTDIR)" "$(BDFDIR)" "$(TTFDIR)"
 
-user-bdf: user-bdfs
+user-font: user-fonts
 
-user-bdfs:
-	$(MAKE) install-bdfs BDFDIR=~/.fonts
+user-fonts:
+	$(MAKE) install-fonts BDFDIR=$(HOME)/.fonts TTFDIR=$(HOME)/.fonts
 
 user-symlinks: all
 	SRC=$$( pwd ) ; \
-- 
cgit v1.2.3