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

[Stefano Sabatini]

On date Sunday 2009-07-12 21:57:17 +0100, M?ns Rullg?rd wrote:
> Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
> 
> > On date Sunday 2009-07-12 15:29:32 +0200, mru wrote:
> >> Author: mru
> >> Date: Sun Jul 12 15:29:32 2009
> >> New Revision: 19404
> >> 
> >> Log:
> >> Separate C preprocessor flags into CPPFLAGS variable
> >> 
> >> Modified:
> >>    trunk/common.mak
> >>    trunk/configure
> >> 
> >> Modified: trunk/common.mak
> >> ==============================================================================
> >> --- trunk/common.mak	Sun Jul 12 15:22:01 2009	(r19403)
> >> +++ trunk/common.mak	Sun Jul 12 15:29:32 2009	(r19404)
> >> @@ -18,16 +18,17 @@ endif
> >>  
> >>  ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
> >>  
> >> -CFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(OPTFLAGS)
> >> +CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
> >> +CFLAGS := $(OPTFLAGS)
> >>  
> >>  %.o: %.c
> >> -	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
> >> +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
> >>  
> >>  %.o: %.S
> >> -	$(AS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
> >> +	$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
> >>  
> >>  %.ho: %.h
> >> -	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
> >> +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
> >>  
> >>  %.d: %.c
> >>  	$(DEPEND_CMD) > $@
> >> 
> >> Modified: trunk/configure
> >> ==============================================================================
> > [...]
> >> @@ -2472,6 +2484,7 @@ enabled stripping &&
> >>      echo "STRIP=$strip" >> config.mak ||
> >>      echo "STRIP=echo ignoring strip" >> config.mak
> >>  
> >> +echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
> >>  echo "OPTFLAGS=$CFLAGS" >> config.mak
> >>  echo "LDFLAGS=$LDFLAGS" >> config.mak
> >>  echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
> >
> > That's causing me trouble, what's the point of the '?'?
> 
> To make it work of course.
> 
> > In the case it is already defined in the environment, CPPFLAGS is not
> > defined, so all the -D_ISOC99_SOURCE etc. flags are not set and the
> > compilation fails whenever they are required.
> 
> Why do you set CPPFLAGS in your environment?

Well, I put it here years ago when I wasn't really sure about its
usage, and it's most likely pretty useless now, anyway its mere
definition in the environment shouldn't be a valid reason to make
FFmpeg fail to compile.
 
> Anyway, I'll see about fixing this.

Many thanks.