From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Fri, 7 May 2010 15:27:20 +0000 (+0200)
Subject: Allow to compile ffmpeg with -O0
X-Git-Tag: jsa-paper-casestudy-v2~64
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/demo.git/commitdiff_plain/242243f5c3a2cfa8187140b824c30430bd1b9a1e?hp=d889694693a3cb61d6408fe9ef3dee24ba5e834f

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 91435bc..dd600af 100644
--- 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 e6e21f4..498df61 100644
--- 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  $@"