fix handling of CFLAGS/CXXFLAGS, now using AM_CFLAGS

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 86188b4d16ba84586bff31c043d1db98358bb3da..e685c0b0163ccf386119cb711aaf01a97419b83a 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -16,7 +16,8 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+
+AM_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 bab080853d564bd96b3c2e2dff5fd49f12896e97..36d27afce08dd3a4cb81dbe371c0cc427dd7e913 100644 (file)
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -29,7 +29,6 @@
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 lib_LTLIBRARIES = libFLAC++.la
-CXXFLAGS = @CXXFLAGS@
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libFLAC++.m4

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 371cdae8549f827f874792a3287ee7b4f031f4ae..389a96d2ccdfd2bd0afdf7cd81e4c11c144e85b9 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -43,7 +43,8 @@ else
 CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
 endif
 endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) $(CPUCFLAGS)
+
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
 
 if FLaC__NO_ASM
 else

diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am
index 46e9f7c88fee21244127ecfdc1c2668f5b507753..ad7291acaede0a6394e71d78a3ee93fe166f09ca 100644 (file)
--- a/src/libOggFLAC++/Makefile.am
+++ b/src/libOggFLAC++/Makefile.am
@@ -29,7 +29,6 @@
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 lib_LTLIBRARIES = libOggFLAC++.la
-CXXFLAGS = @CXXFLAGS@
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libOggFLAC++.m4

diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am
index 340d124acf8046aba60023ae128dc90854f3c8f4..fc25953fc2587c9ab5c3d9f666f65824d844550c 100644 (file)
--- a/src/libOggFLAC/Makefile.am
+++ b/src/libOggFLAC/Makefile.am
@@ -32,7 +32,8 @@ lib_LTLIBRARIES = libOggFLAC.la
 if DEBUG
 DEBUGCFLAGS = 
 endif
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
+
+AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
 
 SUBDIRS = include .
 

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 8abd2fc5afcb717c0d5f0f7b9dc8e4981c1e170c..fff3a1fc4f74f63667d6faf7fa7a780413d3d842 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -16,7 +16,6 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@
 
 EXTRA_DIST = \
        Makefile.lite \

diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index 18afa2df52c274e1a75239192817a66b1136d7cc..bf1b78e39a3a785ec185ea5c0bdf62e587ba6c87 100644 (file)
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -29,7 +29,8 @@ noinst_HEADERS = \
        plugin.h \
        tag.h
 
-CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @XMMS_CFLAGS@
+
 INCLUDES = -I$(top_srcdir)/src
 if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
 xmmsinputplugindir = $(HOME)/.xmms/Plugins

diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am
index a11d752c38400ad74589170ce5c1c47964e351be..0fc1822785d267aff3df69183a7f3569cd1b8a8f 100644 (file)
--- a/src/test_grabbag/cuesheet/Makefile.am
+++ b/src/test_grabbag/cuesheet/Makefile.am
@@ -19,8 +19,6 @@ EXTRA_DIST = \
        Makefile.lite \
        test_cuesheet.dsp
 
-CFLAGS = @CFLAGS@
-
 noinst_PROGRAMS = test_cuesheet
 test_cuesheet_SOURCES = \
        main.c

diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index ea7ce0cf64558760ec1807af8d48a34453183b89..a72277853093b081c76aae42bb01016b361ba348 100644 (file)
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -15,8 +15,6 @@
 #  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@
-
 EXTRA_DIST = \
        Makefile.lite \
        README \

diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index e9a07aaae38755347af41d50dea16729bd097f33..db1baf95abeaf32ed9fb8db2aa8c92628116fe3e 100644 (file)
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -19,7 +19,6 @@ EXTRA_DIST = \
        Makefile.lite \
        test_libFLAC.dsp
 
-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 1615a811951c86d87f4e14bffb64759edca101ef..c2de526f6b2896631666adaadb58bf9f61716a83 100644 (file)
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/src/test_libOggFLAC++/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
        README \
        test_libOggFLAC++.dsp
 
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
 
 noinst_PROGRAMS = test_libOggFLAC++
 test_libOggFLAC___LDADD = \

diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index 59a2aed095b42c95d7f490aadf15a8016ad74c25..63f3bb95412c8e52f091c7d574b87201cf25a219 100644 (file)
--- a/src/test_libOggFLAC/Makefile.am
+++ b/src/test_libOggFLAC/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = \
        Makefile.lite \
        test_libOggFLAC.dsp
 
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
 INCLUDES = 
 
 noinst_PROGRAMS = test_libOggFLAC

diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am
index 1036180c750aa24d2170d8b290d6a692da8b461c..f590a85fa0b91e922de85e90094dbd37deb789fb 100644 (file)
--- a/src/test_seeking/Makefile.am
+++ b/src/test_seeking/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = \
        Makefile.lite \
        test_seeking.dsp
 
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
 INCLUDES = 
 
 if FLaC__HAS_OGG

diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index 3b821275b1f0cafbd1b39e6574877cadd3e42f84..13b1f47daedd8d86fd9f8ae25b740c997debf297 100644 (file)
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -19,8 +19,6 @@ EXTRA_DIST = \
        Makefile.lite \
        test_streams.dsp
 
-CFLAGS = @CFLAGS@
-
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \
        main.c