From 802d94c36edcd05b53a56ee359d9559cc4e11597 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 13 Apr 2017 21:03:41 -0300 Subject: [PATCH] build: fix tools build dependencies Found-by: Michael Niedermayer Signed-off-by: James Almer --- Makefile | 4 ++++ tools/Makefile | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b3132f4cf7..d5b51de7e7 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,10 @@ all: $(AVPROGS) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) +tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) +tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) + CONFIGURABLE_COMPONENTS = \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/version.h)) \ diff --git a/tools/Makefile b/tools/Makefile index f8e1434f29..49f55d2a9e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,6 @@ TOOLS = qt-faststart trasher uncoded_frame TOOLS-$(CONFIG_ZLIB) += cws2fws -tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) -tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) -tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) - OBJDIRS += tools clean::