Fix slightly botched search-and-replace which produced constructs like

"@ CFLAGS".

src/flac/Makefile.am

@@ -16,7 +16,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = flac
-CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@  @ OGG_CFLAGS@ 
 
 if FLaC__HAS_OGG
 NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la

src/libFLAC/Makefile.am

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libFLAC.la
 if DEBUG
 DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
 endif
-CFLAGS = @ CFLAGS@  $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@  $(DEBUGCFLAGS)
 
 if FLaC__NO_ASM
 else

src/libOggFLAC/Makefile.am

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libOggFLAC.la
 if DEBUG
 DEBUGCFLAGS = 
 endif
-CFLAGS = @ CFLAGS@  $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@  $(DEBUGCFLAGS)
 
 SUBDIRS = include .
 

src/metaflac/Makefile.am

@@ -16,7 +16,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = metaflac
-CFLAGS = @ CFLAGS@ 
+CFLAGS = @CFLAGS@ 
 
 EXTRA_DIST = \
 	Makefile.lite \

src/plugin_xmms/Makefile.am

@@ -27,7 +27,7 @@ noinst_HEADERS = \
 	configure.h \
 	wrap_id3.h
 
-CFLAGS = @ CFLAGS@  @ ID3LIB_CFLAGS@  @ XMMS_CFLAGS@ 
+CFLAGS = @CFLAGS@  @ ID3LIB_CFLAGS@  @ XMMS_CFLAGS@ 
 INCLUDES = -I$(top_srcdir)/src
 xmmsinputplugindir = @ XMMS_INPUT_PLUGIN_DIR@ 
 

src/test_libFLAC++/Makefile.am

@@ -15,7 +15,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-CFLAGS = @ CFLAGS@ 
+CFLAGS = @CFLAGS@ 
 
 EXTRA_DIST = \
 	Makefile.lite \

src/test_libFLAC/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @ CFLAGS@ 
+CFLAGS = @CFLAGS@ 
 INCLUDES = -I$(top_srcdir)/src/libFLAC/include
 
 noinst_PROGRAMS = test_libFLAC

src/test_libOggFLAC++/Makefile.am

@@ -20,7 +20,7 @@ EXTRA_DIST = \
 	Makefile.vc \
 	README
 
-CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@  @ OGG_CFLAGS@ 
 
 noinst_PROGRAMS = test_libOggFLAC++
 test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  -lm

src/test_libOggFLAC/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@  @ OGG_CFLAGS@ 
 INCLUDES = 
 
 noinst_PROGRAMS = test_libOggFLAC

src/test_streams/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @ CFLAGS@ 
+CFLAGS = @CFLAGS@ 
 
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \