aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-02-20 17:16:42 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-02-22 02:38:41 +0100
commit5effda08fe9650b28a25326660c4e21e0f283ec2 (patch)
tree97fc2498ab2bbcd3feadfd439f4558897fa24337
parent46382ae2ec4f705e574f83164f3ab58178e000e9 (diff)
downloadffmpeg-5effda08fe9650b28a25326660c4e21e0f283ec2.tar.gz
Makefile: include deps from tools directory
This ensures the tools are rebuilt when necessary. Specifically, lavfi-showfiltfmts was sometimes not rebuilt causing spurious test failures. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 08df7f866663f83ba42398cea9f3eeff4681ea9a)
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4ed003b7a5..ad1f737ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,8 @@ tools/%$(EXESUF): tools/%.o
tools/%.o: tools/%.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<
+-include $(wildcard tools/*.d)
+
ffplay.o: CFLAGS += $(SDL_CFLAGS)
VERSION_SH = $(SRC_PATH_BARE)/version.sh