summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-13 21:03:41 -0300
committerJames Almer <jamrial@gmail.com>2017-04-13 21:03:55 -0300
commit802d94c36edcd05b53a56ee359d9559cc4e11597 (patch)
tree1416647368e8cae9eed5020a360490317e300630
parent074e636c5ca1f9e9ab2f1eda1a36e7cb978f9af1 (diff)
build: fix tools build dependencies
Found-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--Makefile4
-rw-r--r--tools/Makefile4
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::