]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
Fixes in ffmpeg build
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 14 May 2010 14:31:36 +0000 (16:31 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 14 May 2010 14:33:15 +0000 (16:33 +0200)
build/config.target

index 498df61e51fdacfdbb17b2acb3abff283b1d3b62..94ef9947dbf4e01237daf8fb460e39d353299d8b 100644 (file)
@@ -16,9 +16,10 @@ $(SOURCES_DIR)/Makefile.omk: $(MAKERULES_DIR)/ffmpeg/libswscale \
                             $(MAKERULES_DIR)/Makefile.omk.ffmpeg \
                             $(FFMPEG_BUILD_DIR)/config.mak \
                             $(FFMPEG_BUILD_DIR)/version.h \
-                            $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile
+                            $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile \
+                            $(MAKERULES_DIR)/../build/config.target # this file
        @echo "  FFOMK   $@"
-       $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" >> $@
+       $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" > $@
        $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
 
 $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile.inc.ffmpeg: $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile
@@ -37,7 +38,7 @@ $(MAKERULES_DIR)/ffmpeg/libswscale:
        ln -sf ../../src/libswscale $@
 
 ifeq ($(wildcard $(FFMPEG_BUILD_DIR)/Makefile),)
-$(wildcard $(FFMPEG_BUILD_DIR)/Makefile): $(FFMPEG_BUILD_DIR)/config.mak
+$(FFMPEG_BUILD_DIR)/Makefile: $(FFMPEG_BUILD_DIR)/config.mak
 endif
 
 $(FFMPEG_BUILD_DIR)/config.mak: \