Configure FFMPEG by OMK and disable everything

Now, it is not required to manually invoke FFMPEG scripts such as
./configure and ./version.sh.
This is to speed up compilation. We will need to enable the
codecs/muxers/protocols used in the demo.

diff --git a/README b/README
index 77dbcdbefcd975c468ee447837a96725ee0dbe82..01a448234c1cdf75aedb8d27bde905225ec4b1be 100644 (file)
--- a/README
+++ b/README
@@ -10,7 +10,6 @@ which does all the steps):
 2) Compile it
 
    cd build
-   ( cd ffmpeg && ln -s ../../src/libswscale . && ./configure && ./version.sh $PWD version.h )
    make default-config
    echo CONFIG_AQUOSA=y >>config.omk
    make

diff --git a/build/config.target b/build/config.target
index ff22b5856fc70a68a0e18663d9ca41976f367ab3..1573764be1de552110b959c7c18de3772a93547c 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -8,21 +8,16 @@ ifndef RELATIVE_DIR
 RELATIVE_DIR := $(SOURCES_DIR:$(OUTPUT_DIR)%=%)
 endif
 
-ifeq ($(RELATIVE_DIR:ffmpeg%=ffmpeg),ffmpeg)
-
 # Allow building ffmpeg by OMK
-define FFMPEG_OMKIZE
-lib_LIBRARIES:=$(NAME)
-$(NAME)_SOURCES:=$(OBJS:%.o=%.c) $(OBJS-y:%.o=%.c) $(OBJS-yes:%.o=%.c)
-renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
-INCLUDES += -I $(srcdir)/..
-endef
-
-$(SOURCES_DIR)/Makefile.omk: $(SOURCES_DIR)/Makefile $(MAKERULES_DIR)/ffmpeg/libswscale $(MAKERULES_DIR)/Makefile.omk.ffmpeg
+ifeq ($(RELATIVE_DIR:ffmpeg%=ffmpeg),ffmpeg)
+$(SOURCES_DIR)/Makefile.omk: $(SOURCES_DIR)/Makefile \
+                            $(MAKERULES_DIR)/ffmpeg/libswscale \
+                            $(MAKERULES_DIR)/Makefile.omk.ffmpeg \
+                            $(MAKERULES_DIR)/ffmpeg/config.mak \
+                            $(MAKERULES_DIR)/ffmpeg/vesion.h
        @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" > $@
-#      echo '$(value FFMPEG_OMKIZE)' >> $@ # There is a bug in make
        $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" >> $@
        $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
        $(Q)echo 'CFLAGS := $(CFLAGS) $$(CFLAGS)' >> $@
@@ -36,6 +31,10 @@ $(MAKERULES_DIR)/ffmpeg/libavcodec/x86/Makefile:
 
 $(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/vesion.h:
+       cd $(MAKERULES_DIR)/ffmpeg && ./version.sh $$PWD $@
 endif