From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 19 Apr 2010 09:03:09 +0000 (+0200)
Subject: Fix building of ffmpeg
X-Git-Tag: jsa-paper-casestudy-v2~67
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/demo.git/commitdiff_plain/af928e806b49d5663d4c4577ba60ab4470c7859f

Fix building of ffmpeg

Previously, build failed because non-existent rule for ffmpeg/Makefile
generation. Now, we explicitly state that configure generates this file
but to avoid running configure multiple times, we put it into conditional
block.
---

diff --git a/build/config.target b/build/config.target
index 7c88240..e6e21f4 100644
--- a/build/config.target
+++ b/build/config.target
@@ -37,6 +37,10 @@ $(FFMPEG_BUILD_DIR)/libavcodec/x86/Makefile:
 $(MAKERULES_DIR)/ffmpeg/libswscale:
 	ln -sf ../../src/libswscale $@
 
+ifeq ($(wildcard $(FFMPEG_BUILD_DIR)/Makefile),)
+$(wildcard $(FFMPEG_BUILD_DIR)/Makefile): $(FFMPEG_BUILD_DIR)/config.mak
+endif
+
 $(FFMPEG_BUILD_DIR)/config.mak: \
 		$(MAKERULES_DIR)/ffmpeg/configure \
 	 	$(MAKERULES_DIR)/../build/config.target # this file