diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 21:03:41 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 21:03:55 -0300 |
| commit | 802d94c36edcd05b53a56ee359d9559cc4e11597 (patch) | |
| tree | 1416647368e8cae9eed5020a360490317e300630 | |
| parent | 074e636c5ca1f9e9ab2f1eda1a36e7cb978f9af1 (diff) | |
| download | ffmpeg-802d94c36edcd05b53a56ee359d9559cc4e11597.tar.gz | |
build: fix tools build dependencies
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tools/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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:: |