From 599ab946697b1dd053c467619e04456ccb71789b Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 10 Jun 2007 20:13:26 +0000
Subject: -optimize 'pkg-config' call

---
 liboutput/Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'liboutput')

diff --git a/liboutput/Makefile b/liboutput/Makefile
index 7300393..0392ce4 100644
--- a/liboutput/Makefile
+++ b/liboutput/Makefile
@@ -20,17 +20,27 @@ INCLUDES += -I$(VDRDIR)/include -I.
 ifdef FFMDIR
 INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
 DEFINES += -DFFMDIR
+ifndef WITHOUT_SWSCALER
+  DEFINES += -DHAVE_SWSCALER
+  INCLUDES += -I$(FFMDIR)/libswscale
+endif
 else
-  INCLUDES += $(shell $(PKG-CONFIG) --cflags libavcodec)
+
+ifndef WITHOUT_SWSCALER
+  DEFINES += -DHAVE_SWSCALER
+  PKG-INCLUDES += libswscale
+endif
+
+  PKG-INCLUDES += libavcodec
 endif
 
 DEFINES  += -D_GNU_SOURCE
 
-ifndef WITHOUT_SWSCALER
-  DEFINES += -DHAVE_SWSCALER
-  INCLUDES += $(shell $(PKG-CONFIG) --cflags libswscale)
+ifdef PKG-INCLUDES
+INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
 endif
 
+
 ### The object files (add further files here):
 
 OBJS = encode.o stillimage.o stillimage-player.o
-- 
cgit v1.2.3