Allow to compile ffmpeg with -O0

This allows us to override default ffmpeg CFLAGS with OMK ones. The ffmpeg
compile line starts with FFMPEG CFLAGS and OMK CFLAGS are appended at the
end.

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 91435bc947b141cf28a7c3aba6dc6bb14d2b76fe..dd600af0d70d15dd1f0f49b82f0f217d7a40012e 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -1,5 +1,7 @@
 # -*- makefile-gmake -*-
+CFLAGS_SAVED:=$(CFLAGS)
 include $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile.inc.ffmpeg
+CFLAGS:=$(CFLAGS) $(CFLAGS_SAVED)
 
 lib_LIBRARIES:=$(NAME)
 $(NAME)_SOURCES:=$(OBJS:%.o=%.c) $(OBJS-y:%.o=%.c) $(OBJS-yes:%.o=%.c)

diff --git a/build/config.target b/build/config.target
index e6e21f451fe753d6acb893fa6d58f21cfae33faf..498df61e51fdacfdbb17b2acb3abff283b1d3b62 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -20,7 +20,6 @@ $(SOURCES_DIR)/Makefile.omk: $(MAKERULES_DIR)/ffmpeg/libswscale \
        @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  $@"