[MPlayer-cvslog] r22812 - in trunk: configure mpcommon.mak

[diego]

Author: diego
Date: Sat Mar 24 20:44:15 2007
New Revision: 22812

Modified:
   trunk/configure
   trunk/mpcommon.mak

Log:
Move the addition of basic include flags to configure.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Mar 24 20:44:15 2007
@@ -7409,7 +7409,8 @@ if test "$_largefiles" = yes || freebsd 
   fi
 fi
 
-CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
+CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
 
 cat > $TMPC << EOF
 int main() { return 0; }

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Sat Mar 24 20:44:15 2007
@@ -8,7 +8,7 @@ OBJS_MENCODER  = $(addsuffix .o, $(basen
 
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-CFLAGS += -I. -I.. -I../libavutil $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)
 LIBS-$(MENCODER) += $(LIBNAME_MENCODER)