[FFmpeg-devel] [PATCH][RFC] build: Fix uncoded_frame dependencies

Derek Buitenhuis derek.buitenhuis at gmail.com
Mon May 5 17:06:30 CEST 2014


It requires avformat, avfilter, and avdevice to build.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
This is really ugly. The idea is that avdevice already has deps on avcodec
and avformat.

It's also possible that I could have used the ALLYES macro, but that currently
resides in tests/Makefile only.

Ideas welcome.
---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 82467c3..ea9100f 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,11 @@ OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
 
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
-TOOLS       = qt-faststart trasher uncoded_frame
+TOOLS       = qt-faststart trasher
 TOOLS-$(CONFIG_ZLIB) += cws2fws
+ifeq ($(CONFIG_AVDEVICE),yes)
+TOOLS-$(CONFIG_AVFILTER) += uncoded_frame
+endif
 
 FFLIBS-$(CONFIG_AVDEVICE) += avdevice
 FFLIBS-$(CONFIG_AVFILTER) += avfilter
@@ -64,8 +67,12 @@ $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 	$(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS)
 
 tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
+ifeq ($(CONFIG_AVDEVICE),yes)
+ifeq ($(CONFIG_AVFILTER),yes)
 tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
 tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
+endif
+endif
 
 config.h: .config
 .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
-- 
2.0.0.rc0



More information about the ffmpeg-devel mailing list