From: Matt Zimmerman <mzimmerman@users.sourceforce.net>
Date: Tue, 15 Oct 2002 01:41:11 +0000 (+0000)
Subject: Fix slightly botched search-and-replace which produced constructs like
X-Git-Tag: 1.2.0~1467
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3960df1f7888bc6cc604696cba4fd8ceb8280028;p=platform%2Fupstream%2Fflac.git

Fix slightly botched search-and-replace which produced constructs like
"@ CFLAGS".
---

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index cd0ce7d..57aed84 100644
--- a/src/flac/Makefile.am
+++ b/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
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 22a323c..9cf1eb0 100644
--- a/src/libFLAC/Makefile.am
+++ b/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
diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am
index 14dc968..bc58bad 100644
--- a/src/libOggFLAC/Makefile.am
+++ b/src/libOggFLAC/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libOggFLAC.la
 if DEBUG
 DEBUGCFLAGS = 
 endif
-CFLAGS = @ CFLAGS@  $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@  $(DEBUGCFLAGS)
 
 SUBDIRS = include .
 
diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 041c05e..bde4133 100644
--- a/src/metaflac/Makefile.am
+++ b/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 \
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index e34394d..c95afe4 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/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@ 
 
diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 7c9a662..95ae79d 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/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 \
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 1f74fa6..563062b 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/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
diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am
index d7a7190..1eb825d 100644
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/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
diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index de0b721..26afbab 100644
--- a/src/test_libOggFLAC/Makefile.am
+++ b/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
diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index c573c3b..acc8da0 100644
--- a/src/test_streams/Makefile.am
+++ b/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 = \