[FFmpeg-cvslog] r19406 - in trunk: common.mak configure

[mru]

Author: mru
Date: Sun Jul 12 15:29:38 2009
New Revision: 19406

Log:
Set CFLAGS directly in config.mak instead of using OPTFLAGS

Modified:
   trunk/common.mak
   trunk/configure

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Jul 12 15:29:35 2009	(r19405)
+++ trunk/common.mak	Sun Jul 12 15:29:38 2009	(r19406)
@@ -19,7 +19,6 @@ endif
 ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 
 CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
-CFLAGS := $(OPTFLAGS)
 
 %.o: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Jul 12 15:29:35 2009	(r19405)
+++ trunk/configure	Sun Jul 12 15:29:38 2009	(r19406)
@@ -2485,7 +2485,7 @@ enabled stripping &&
     echo "STRIP=echo ignoring strip" >> config.mak
 
 echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
-echo "OPTFLAGS=$CFLAGS" >> config.mak
+echo "CFLAGS=$CFLAGS" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak