From b8671ccffc526763a64d7f7614dd8ba66e6fb540 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Tue, 19 Jul 2005 15:36:03 +0000
Subject: - add alternative script (scripts/maverickplugin.sh) for image
 converting with imagemagick - adjust encoding parameter for new
 ffmpeg-releases, downwards compatible - remove linking with dlfcn at runtime
 of libavcodec.so, now are linked at compiled time - some code refactoring, to
 enhance readability

---
 Makefile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 24b86d4..28c7a71 100644
--- a/Makefile
+++ b/Makefile
@@ -41,20 +41,10 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. 
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I. -I$(FFMDIR)
 DEFINES  += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 DEFINES  += -D_GNU_SOURCE
-
-
-LIBS += liboutput/liboutput.a libimage/libimage.a
-
-ifdef FFMPEG_STATIC
-	INCLUDES += -I$(FFMDIR)
-	DEFINES += -DHAVE_FFMPEG_STATIC
-	LIBS += -L$(FFMDIR)/libavcodec -lavcodec -lz
-else
-	LIBS += -ldl -rdynamic
-endif
+LIBS += liboutput/liboutput.a libimage/libimage.a -L$(FFMDIR)/libavcodec -lavcodec -lz
 
 ### The object files (add further files here):
 
-- 
cgit v1.2.3