--- alsaplayer-0.99.77-orig/app/Makefile.am	2003-02-09 13:37:55.000000000 -0600
+++ alsaplayer-0.99.77-orig/app/Makefile.am	2007-02-13 00:21:02.000000000 -0600
@@ -27,8 +27,6 @@ 
 
 AM_CXXFLAGS = $(COMMON_FLAGS)
 
-AM_CFLAGS = $(CXXFLAGS)
-
 bin_PROGRAMS = alsaplayer
 
 alsaplayer_LDFLAGS = -export-dynamic
--- alsaplayer-0.99.77-orig/configure.ac	2007-02-01 16:42:27.000000000 -0600
+++ alsaplayer-0.99.77-orig/configure.ac	2007-02-13 00:20:22.000000000 -0600
@@ -589,14 +589,14 @@ 
 
 AC_MSG_CHECKING(for gcc optimization flags)
 old_cflags=$CFLAGS
-CFLAGS="$CFLAGS -O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"
+CFLAGS="$CFLAGS"
 AC_TRY_COMPILE([#include <stdio.h>],
 [ printf ("hello, world"); ],
-[ EXTRA_OPT_CFLAGS="-O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
+[ EXTRA_OPT_CFLAGS="$CFLAGS"],[ EXTRA_OPT_CFLAGS=""])
 CFLAGS=$old_cflags
 AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
 
-ARCH_CFLAGS="$EXTRA_OPT_CFLAGS $CFLAGS"
+ARCH_CFLAGS="$EXTRA_OPT_CFLAGS"
 
 if test "$ARCH_TYPE" = "i486" || test "$ARCH_TYPE" = "i586" || test "$ARCH_TYPE" = "i686"
 then
--- alsaplayer-0.99.77-orig/input/mad/Makefile.am	2003-02-09 13:37:56.000000000 -0600
+++ alsaplayer-0.99.77-orig/input/mad/Makefile.am	2007-02-13 00:21:35.000000000 -0600
@@ -28,8 +28,6 @@ 
 
 AM_CFLAGS = $(COMMON_CFLAGS)
 
-AM_CXXFLAGS = $(CFLAGS)
-
 INCLUDES = -I$(ROOT_DIR)/app $(GLIB_CFLAGS)
 
 libmad_in_la_SOURCES = $(mad_insources)
--- alsaplayer-0.99.77-orig/interface/daemon/Makefile.am	2003-02-16 12:23:18.000000000 -0600
+++ alsaplayer-0.99.77-orig/interface/daemon/Makefile.am	2007-02-13 00:22:14.000000000 -0600
@@ -10,8 +10,6 @@ 
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libdaemon_interface_la_LDFLAGS = $(daemon_interfaceldflags)
--- alsaplayer-0.99.77-orig/interface/gtk/Makefile.am	2003-02-16 12:23:19.000000000 -0600
+++ alsaplayer-0.99.77-orig/interface/gtk/Makefile.am	2007-02-13 00:22:36.000000000 -0600
@@ -25,8 +25,6 @@ 
 		@GLIB_CFLAGS@ @GTK_CFLAGS@ $(COMMON_FLAGS) \
 		-D_REENTRANT -DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libgtk_interface_la_LDFLAGS = $(gtk_interfaceldflags)
--- alsaplayer-0.99.77-orig/interface/text/Makefile.am	2003-02-16 12:23:19.000000000 -0600
+++ alsaplayer-0.99.77-orig/interface/text/Makefile.am	2007-02-13 00:23:35.000000000 -0600
@@ -10,8 +10,6 @@ 
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libtext_interface_la_LDFLAGS = $(text_interfaceldflags)
--- alsaplayer-0.99.77-orig/interface/xosd/Makefile.am	2003-02-16 12:23:21.000000000 -0600
+++ alsaplayer-0.99.77-orig/interface/xosd/Makefile.am	2007-02-13 00:25:00.000000000 -0600
@@ -22,8 +22,6 @@ 
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libxosd_interface_la_LDFLAGS = $(xosd_interfaceldflags)