[SCM] libav/experimental: Move ECFLAGS so it doesn't get added multiple times

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:58:55 UTC 2013


The following commit has been merged in the experimental branch:
commit 8be0a5c384a26936cf070fb20bffcc6a1a130e1f
Author: Måns Rullgård <mans at mansr.com>
Date:   Thu Jan 28 23:30:24 2010 +0000

    Move ECFLAGS so it doesn't get added multiple times
    
    Originally committed as revision 21520 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index e94e98e..c4d5f2b 100644
--- a/common.mak
+++ b/common.mak
@@ -20,6 +20,7 @@ endif
 ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 
 CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS)
+CFLAGS   += $(ECFLAGS)
 
 %.o: %.c
 	$(CCDEP)
@@ -54,7 +55,7 @@ endif
 
 OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)
 
-CFLAGS    += $(CFLAGS-yes) $(ECFLAGS)
+CFLAGS    += $(CFLAGS-yes)
 OBJS      += $(OBJS-yes)
 FFLIBS    := $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list