From 16a508e059c6077acc2b5ad6657832affb78b7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 9 Jul 2009 00:49:22 +0300
Subject: Use pkg-config for finding FreeType and Imlib2.

---
 Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 382595f..947e71c 100644
--- a/Makefile
+++ b/Makefile
@@ -75,25 +75,20 @@ endif
 
 ifdef HAVE_IMLIB2
 	DEFINES += -DHAVE_IMLIB2
-	LIBS += -lImlib2
+	INCLUDES += $(shell pkg-config --cflags imlib2)
+	LIBS += $(shell pkg-config --libs imlib2)
 endif
 
 ifdef HAVE_IMAGEMAGICK
 	DEFINES += -DHAVE_IMAGEMAGICK
-	INCLUDES += `pkg-config --cflags ImageMagick++`
-	LIBS += `pkg-config --libs ImageMagick++`
-#	LIBS += $(shell Magick++-config --ldflags --libs)
+	INCLUDES += $(shell pkg-config --cflags ImageMagick++)
+	LIBS += $(shell pkg-config --libs ImageMagick++)
 endif
 
 ifdef HAVE_FREETYPE
-	ifneq ($(shell which freetype-config),)
-		INCLUDES += $(shell freetype-config --cflags)
-		LIBS += $(shell freetype-config --libs)
-	else
-		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-		LIBS += -lfreetype
-	endif
 	DEFINES += -DHAVE_FREETYPE
+	INCLUDES += $(shell pkg-config --cflags freetype2)
+	LIBS += $(shell pkg-config --libs freetype2)
 	OBJS += graphtft/font.o
 endif
 
-- 
cgit v1.2.3