From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 23 May 2015 16:09:29 +0000 (+0200)
Subject: Makefile: use absolute paths for static ffmpeg libraries, fixes #2872
X-Git-Tag: v4.2.1~2483
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e5fca19cf735db6338e794b8bf63d801d23f1e;p=thirdparty%2Ftvheadend.git

Makefile: use absolute paths for static ffmpeg libraries, fixes #2872
---

diff --git a/Makefile b/Makefile
index 625ca8c94..16ba80421 100644
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,25 @@ endif
 
 ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
 CFLAGS  += -I${ROOTDIR}/libav_static/build/ffmpeg/include
-LDFLAGS += -L${ROOTDIR}/libav_static/build/ffmpeg/lib -Wl,-Bstatic \
-           -lavresample -lswresample -lswscale \
-           -lavutil -lavformat -lavcodec -lavutil \
-           -lvorbisenc -lvorbis -logg -lx264 -lvpx \
-           -Wl,-Bdynamic -ldl
+LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib
+LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libswresample.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libswscale.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libavformat.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libavcodec.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libvorbisenc.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libvorbis.a
+LDFLAGS += ${LDFLAGS_FFDIR}/libogg.a
+ifeq ($(CONFIG_LIBFFMPEG_STATIC_X264),yes)
+LDFLAGS += ${LDFLAGS_FFDIR}/libx264.a
+else
+LDFLAGS += -lx264
+endif
+LDFLAGS += ${LDFLAGS_FFDIR}/libvpx.a
 endif
+
 ifeq ($(CONFIG_HDHOMERUN_STATIC),yes)
 CFLAGS  += -I${ROOTDIR}/libhdhomerun_static
 LDFLAGS += -L${ROOTDIR}/libhdhomerun_static/libhdhomerun \