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 5e16235702c313ae7bff551691dc28176744afe7..7c88240796c3d6a13186734e8db631c771e81c8a 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -1,4 +1,4 @@
-# -*- makefile -*-
+# -*- makefile-gmake -*-
 # Config file for compilation by OMK for AQuoSA/Linux OS target
 
 OMIT_KERNEL_PASSES=y
@@ -8,33 +8,42 @@ ifndef RELATIVE_DIR
 RELATIVE_DIR := $(SOURCES_DIR:$(OUTPUT_DIR)%=%)
 endif
 
+FFMPEG_BUILD_DIR=$(OUTPUT_DIR)/_build/user/ffmpeg
+
 # Allow building ffmpeg by OMK
 ifeq ($(RELATIVE_DIR:ffmpeg%=ffmpeg),ffmpeg)
-$(SOURCES_DIR)/Makefile.omk: $(SOURCES_DIR)/Makefile \
-                            $(MAKERULES_DIR)/ffmpeg/libswscale \
+$(SOURCES_DIR)/Makefile.omk: $(MAKERULES_DIR)/ffmpeg/libswscale \
                             $(MAKERULES_DIR)/Makefile.omk.ffmpeg \
-                            $(MAKERULES_DIR)/ffmpeg/config.mak \
-                            $(MAKERULES_DIR)/ffmpeg/version.h
+                            $(FFMPEG_BUILD_DIR)/config.mak \
+                            $(FFMPEG_BUILD_DIR)/version.h \
+                            $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile
        @echo "  FFOMK   $@"
-       $(Q)make DEPS="" -C $(SOURCES_DIR) -qp -f $< |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 := $(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" > $@
 
-$(MAKERULES_DIR)/ffmpeg/tools/Makefile:
+$(FFMPEG_BUILD_DIR)/tools/Makefile:
        touch $@
 
-$(MAKERULES_DIR)/ffmpeg/libavcodec/x86/Makefile:
+$(FFMPEG_BUILD_DIR)/libavcodec/x86/Makefile:
        touch $@
 
 $(MAKERULES_DIR)/ffmpeg/libswscale:
        ln -sf ../../src/libswscale $@
-$(MAKERULES_DIR)/ffmpeg/config.mak: $(MAKERULES_DIR)/../build/config.target # this file
-       cd $(MAKERULES_DIR)/ffmpeg && ./configure --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices
-$(MAKERULES_DIR)/ffmpeg/version.h:
-       cd $(MAKERULES_DIR)/ffmpeg && ./version.sh $$PWD $@
+
+$(FFMPEG_BUILD_DIR)/config.mak: \
+               $(MAKERULES_DIR)/ffmpeg/configure \
+               $(MAKERULES_DIR)/../build/config.target # this file
+       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) $@
 endif