From 7c0a76f027d5820af7f2bbbe6abb3234383a5d9b Mon Sep 17 00:00:00 2001
From: kraxel <kraxel>
Date: Mon, 7 Jun 2004 19:19:20 +0000
Subject: - fbi: switch over text rendering to freetype2 + fontconfig.

---
 GNUmakefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 471bd23..b056a25 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -106,7 +106,6 @@ fbi : LDLIBS += $(call ac_lib_mkvar,$(fbi_libs),LDLIBS)
 
 # jpeg/exif libs
 exiftran      : LDLIBS += -ljpeg -lexif -lm
-genthumbnail  : LDLIBS += -ljpeg -lexif -lm
 thumbnail.cgi : LDLIBS += -lexif -lm
 
 exiftran: exiftran.o genthumbnail.o jpegtools.o jpeg/transupp.o \
@@ -156,7 +155,7 @@ ida.o: Ida.ad.h logo.h
 
 # object files
 OBJS_FBI := \
-	fbi.o fbtools.o fs.o fb-gui.o desktop.o \
+	fbi.o fbtools.o fb-gui.o desktop.o \
 	parseconfig.o fbiconfig.o \
 	jpegtools.o jpeg/transupp.o \
 	dither.o filter.o op.o
@@ -164,8 +163,9 @@ OBJS_FBI := \
 OBJS_FBI += $(filter-out wr/%,$(call ac_lib_mkvar,$(fbi_libs),OBJS))
 
 # jpeg/exif libs
+fbi : CFLAGS += $(shell pkg-config --cflags freetype2 fontconfig)
+fbi : LDLIBS += $(shell pkg-config --libs   freetype2 fontconfig)
 fbi : LDLIBS += -ljpeg -lexif -lm
-fs.o fb-gui.o : CFLAGS += -DX_DISPLAY_MISSING=1
 
 fbi: $(OBJS_FBI) $(OBJS_READER)
 
@@ -213,4 +213,3 @@ include $(srcdir)/mk/Maintainer.mk
 sync::
 	cp $(srcdir)/../xawtv/common/parseconfig.[ch] $(srcdir)
 	cp $(srcdir)/../xawtv/console/fbtools.[ch] $(srcdir)
-	cp $(srcdir)/../xawtv/console/fs.[ch] $(srcdir)
-- 
cgit