]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
Fix building of ffmpeg
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 19 Apr 2010 09:03:09 +0000 (11:03 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 19 Apr 2010 09:03:09 +0000 (11:03 +0200)
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.

build/config.target

index 7c88240796c3d6a13186734e8db631c771e81c8a..e6e21f451fe753d6acb893fa6d58f21cfae33faf 100644 (file)
@@ -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