Fix simultaneous building of ffmpeg with and w/o FRSH

[frescor/demo.git] / build / config.target

diff --git a/build/config.target b/build/config.target
index 735382fb4f65050e25ece033cded37f50a7d6909..7c88240796c3d6a13186734e8db631c771e81c8a 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -18,13 +18,15 @@ $(SOURCES_DIR)/Makefile.omk: $(MAKERULES_DIR)/ffmpeg/libswscale \
                             $(FFMPEG_BUILD_DIR)/version.h \
                             $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile
        @echo "  FFOMK   $@"
-       $(Q)make DEPS="" -C $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR) -rqp \
-               | sed -ne '/# Pattern-specific Variable Values/,$$ d' -e '/# makefile/,+1 p' \
-               | sed -e /^define/d -e "/^#/d" -e "/^MAKE/d" > $@
        $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" >> $@
        $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
-       $(Q)echo 'CFLAGS := -I. $(CFLAGS) $$(CFLAGS)' >> $@
+       $(Q)echo 'CFLAGS := $(CFLAGS) $$(CFLAGS)' >> $@
 
+$(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile.inc.ffmpeg: $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile
+       @echo "  SCRIPT  $@"
+       $(Q)make DEPS="" -C $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR) -rqp \
+               | sed -ne '/# Pattern-specific Variable Values/,$$ d' -e '/# makefile/,+1 p' \
+               | sed -e /^define/d -e "/^#/d" -e "/^MAKE/d" > $@
 
 $(FFMPEG_BUILD_DIR)/tools/Makefile:
        touch $@
@@ -38,7 +40,7 @@ $(MAKERULES_DIR)/ffmpeg/libswscale:
 $(FFMPEG_BUILD_DIR)/config.mak: \
                $(MAKERULES_DIR)/ffmpeg/configure \
                $(MAKERULES_DIR)/../build/config.target # this file
-       cd $(dir $@) && $(MAKERULES_DIR)/ffmpeg/configure
+       cd $(dir $@) && $(MAKERULES_DIR)/ffmpeg/configure $(if $(CONFIG_FFMPEG_WITH_FRSH:y=),--disable-protocol=frsh)
 
 $(FFMPEG_BUILD_DIR)/version.h:
        cd $(dir $@) && $(MAKERULES_DIR)/ffmpeg/version.sh $(PWD) $@