From 6c998839275531e0424160adf221be80b8eabe76 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sat, 22 Oct 2005 09:52:40 +0000
Subject: * add FFMDIR to liboutput/Makefile, for build again ffmpeg directory

---
 Makefile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3df7418..b7b7ee8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
-FFMDIR = ../../../../ffmpeg
+#FFMDIR = ../../../../ffmpeg
 
 ### Allow user defined options to overwrite defaults:
 
@@ -41,11 +41,26 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
+ifdef FFMDIR
+INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+endif
+
 DEFINES  += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 DEFINES  += -D_GNU_SOURCE
 LIBS += liboutput/liboutput.a libimage/libimage.a -L$(FFMDIR)/libavcodec -lavcodec -lz
 
+ifdef FFMDIR
+DEFINES += -DFFMDIR
+endif
+
+ifdef FFMDIR
+LIBS += -L$(FFMDIR)/libavcodec
+endif
+
+LIBS += -lavcodec -lz
+
+
 ### The object files (add further files here):
 
 OBJS = ${PLUGIN}.o 
-- 
cgit v1.2.3