Makefile(s): don't re-export twice config variables

tvheadend · Oct 1, 2015 · 7591ad3 · 7591ad3
1 parent e3e39ed
commit 7591ad3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -664,13 +664,7 @@ ${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec
 	@touch $@
 
 ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a: Makefile.ffmpeg
-	CONFIG_LIBX264_STATIC=$(CONFIG_LIBX264_STATIC) \
-	CONFIG_LIBX265=$(CONFIG_LIBX265) \
-	CONFIG_LIBX265_STATIC=$(CONFIG_LIBX265_STATIC) \
-	CONFIG_LIBMFX=$(CONFIG_LIBMFX) \
-	CONFIG_LIBMFX_STATIC=$(CONFIG_LIBMFX_STATIC) \
-	CONFIG_LIBMFX_VA_LIBS="$(CONFIG_LIBMFX_VA_LIBS)" \
-	  $(MAKE) -f Makefile.ffmpeg build
+	$(MAKE) -f Makefile.ffmpeg build
 
 # Static HDHOMERUN library
 

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
@@ -136,7 +136,13 @@ EXTLIBS  += libmfx
 DECODERS += mpeg2_qsv h264_qsv hevc_qsv
 ENCODERS += mpeg2_qsv h264_qsv hevc_qsv
 
-ELIBS += $(CONFIG_LIBMFX_VA_LIBS)
+ELIBS += -lva
+ifeq ($(CONFIG_VA_DRM),yes)
+ELIBS += -lva-drm
+endif
+ifeq ($(CONFIG_VA_X11),yes)
+ELIBS += -lva-x11
+endif
 
 endif