Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

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

diff --git a/build/config.target b/build/config.target
index 735382fb4f65050e25ece033cded37f50a7d6909..f4fa427d9cbf322e8d93fa6f45f4c2843556813a 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -16,15 +16,17 @@ $(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
+                            $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile \
+                            $(MAKERULES_DIR)/../build/config.target # this file
        @echo "  FFOMK   $@"
+       $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" > $@
+       $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
+
+$(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" > $@
-       $(Q)echo "FFMPEG_SUBDIR=$(RELATIVE_DIR:ffmpeg/%=%)" >> $@
-       $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
-       $(Q)echo 'CFLAGS := -I. $(CFLAGS) $$(CFLAGS)' >> $@
-
 
 $(FFMPEG_BUILD_DIR)/tools/Makefile:
        touch $@
@@ -35,10 +37,14 @@ $(FFMPEG_BUILD_DIR)/libavcodec/x86/Makefile:
 $(MAKERULES_DIR)/ffmpeg/libswscale:
        ln -sf ../../src/libswscale $@
 
+ifeq ($(wildcard $(FFMPEG_BUILD_DIR)/Makefile),)
+$(FFMPEG_BUILD_DIR)/Makefile: $(FFMPEG_BUILD_DIR)/config.mak
+endif
+
 $(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) $@
@@ -76,7 +82,7 @@ CONFIG_DISKBFQ=y
 
 # Instead, we call normal gcc with parameters which mgcc adds
 
-CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O1 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O2 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -fPIC
 
 LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS)
 LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags