[MPlayer-cvslog] r22731 - in trunk: configure libmpdemux/Makefile

[diego]

Author: diego
Date: Sun Mar 18 22:58:28 2007
New Revision: 22731

Modified:
   trunk/configure
   trunk/libmpdemux/Makefile

Log:
Move setting CXXFLAGS to configure.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Mar 18 22:58:28 2007
@@ -7409,6 +7409,8 @@ if test "$_largefiles" = yes || freebsd 
   fi
 fi
 
+CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+
 if cc_check -Wdeclaration-after-statement ; then
   CFLAGS="-Wdeclaration-after-statement $CFLAGS"
 fi
@@ -7478,8 +7480,9 @@ RANLIB = $_ranlib
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
-EXTRAXX_INC = $_inc_extraxx
+EXTRAXX_INC = $_inc_extra $_inc_extraxx
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
+CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
 INSTALLSTRIP = $_install_strip
 CHARSET = $_charset
 HELP_FILE = $_mp_help

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Sun Mar 18 22:58:28 2007
@@ -69,6 +69,4 @@ CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
-CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC)
-
 include ../mpcommon.mak