From 2be10e7b7366854e1a4567e0f526c17c78a3a346 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 14 May 2010 16:31:36 +0200 Subject: [PATCH] Fixes in ffmpeg build --- build/config.target | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/config.target b/build/config.target index 498df61..94ef994 100644 --- a/build/config.target +++ b/build/config.target @@ -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: \ -- 2.39.2