[FFmpeg-cvslog] Makefile: include deps from tools directory

Mans Rullgard git
Tue Feb 22 03:17:16 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Feb 20 17:16:42 2011 +0000| [5effda08fe9650b28a25326660c4e21e0f283ec2] | committer: Michael Niedermayer

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 at mansr.com>
(cherry picked from commit 08df7f866663f83ba42398cea9f3eeff4681ea9a)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5effda08fe9650b28a25326660c4e21e0f283ec2
---

 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 4ed003b..ad1f737 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




More information about the ffmpeg-cvslog mailing list