Fix generation of ffmpeg's version.h

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

diff --git a/build/config.target b/build/config.target
index d0a80c7c9f6b4817ccad725bf1b42a9fc7706431..5e16235702c313ae7bff551691dc28176744afe7 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -1,29 +1,23 @@
 # -*- makefile -*-
 # Config file for compilation by OMK for AQuoSA/Linux OS target
 
+OMIT_KERNEL_PASSES=y
+
 # For the FFMPEG2OMK hack, we need RELATIVE_DIR earlier:
 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
-
-CFLAGS+=$(if $(CONFIG_FFMPEG_WITH_FRSH:n=),-DCONFIG_FFMPEG_WITH_FRSH=y)
-
-
-$(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/version.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)' >> $@
@@ -37,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/version.h:
+       cd $(MAKERULES_DIR)/ffmpeg && ./version.sh $$PWD $@
 endif
 
 
@@ -58,6 +56,8 @@ USE_LEAF_MAKEFILES=n
 CONFIG_FORB_PROTO_UNIX=n
 CONFIG_FORB_PROTO_INET_DEFAULT=y
 CONFIG_AQUOSA=y
+CONFIG_FFMPEG_WITH_FRSH=y
+CONFIG_DISKBFQ=y
 
 ########################################
 # Setting of compiler