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 4f27bdd04395c2cbee09e1dd403603c9fdc7b1d0..7c88240796c3d6a13186734e8db631c771e81c8a 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -1,6 +1,52 @@
-# -*- makefile -*-
+# -*- makefile-gmake -*-
 # 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
+
+FFMPEG_BUILD_DIR=$(OUTPUT_DIR)/_build/user/ffmpeg
+
+# Allow building ffmpeg by OMK
+ifeq ($(RELATIVE_DIR:ffmpeg%=ffmpeg),ffmpeg)
+$(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
+       @echo "  FFOMK   $@"
+       $(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" > $@
+
+$(FFMPEG_BUILD_DIR)/tools/Makefile:
+       touch $@
+
+$(FFMPEG_BUILD_DIR)/libavcodec/x86/Makefile:
+       touch $@
+
+$(MAKERULES_DIR)/ffmpeg/libswscale:
+       ln -sf ../../src/libswscale $@
+
+$(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
+
+
 # You can override these variables in config.omk
 AQUOSA_ROOT ?= $(wildcard /usr/local/aquosa)
 QTDIR ?= $(wildcard /usr/share/qt4)
@@ -19,6 +65,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
@@ -30,7 +78,8 @@ CONFIG_AQUOSA=y
 
 # Instead, we call normal gcc with parameters which mgcc adds
 
-CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O1 -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O1 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+
 LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS)
 LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags