From 0436ad2bebd436834b155f7344bffdd67bf658d8 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 31 Mar 2016 22:59:56 +0200
Subject: build: more pkg-config tweaks

---
 GNUmakefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 4bcbe8f..2eba7c3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -90,14 +90,24 @@ endif
 ########################################################################
 # conditional stuff
 
+ifeq ($(HAVE_LIBPNG),yes)
+  PKGS_IDA += libpng
+  PKGS_FBI += libpng
+endif
+ifeq ($(HAVE_LIBTIFF),yes)
+  PKGS_IDA += libtiff-4
+  PKGS_FBI += libtiff-4
+endif
+ifeq ($(HAVE_LIBWEBP),yes)
+  PKGS_IDA += libwebp
+  PKGS_FBI += libwebp
+endif
+
 includes        = ENDIAN_H STRSIGNAL NEW_EXIF
-libraries       = PCD GIF PNG TIFF WEBP CURL SANE LIRC
+libraries       = PCD GIF CURL SANE LIRC
 ida_libs	= PCD GIF PNG TIFF WEBP CURL SANE
 fbi_libs	= PCD GIF PNG TIFF WEBP CURL LIRC
 
-PNG_LDLIBS	:= $(shell $(PKG_CONFIG) --libs libpng)
-TIFF_LDLIBS	:= $(shell $(PKG_CONFIG) --libs libtiff-4)
-WEBP_LDLIBS	:= $(shell $(PKG_CONFIG) --libs libwebp)
 PCD_LDLIBS	:= -lpcd
 GIF_LDLIBS	:= -lgif
 SANE_LDLIBS	:= -lsane
-- 
cgit