Commit 05a39840 authored by Josh Coalson's avatar Josh Coalson

fix handling of CFLAGS/CXXFLAGS, now using AM_CFLAGS

parent 3c8d2973
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -32,7 +32,8 @@ lib_LTLIBRARIES = libOggFLAC.la
if DEBUG
DEBUGCFLAGS =
endif
CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .
......
......@@ -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 \
......
......@@ -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
......
......@@ -19,8 +19,6 @@ EXTRA_DIST = \
Makefile.lite \
test_cuesheet.dsp
CFLAGS = @CFLAGS@
noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
......
......@@ -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 \
......
......@@ -19,7 +19,6 @@ EXTRA_DIST = \
Makefile.lite \
test_libFLAC.dsp
CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
......
......@@ -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 = \
......
......@@ -19,7 +19,8 @@ EXTRA_DIST = \
Makefile.lite \
test_libOggFLAC.dsp
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
......
......@@ -19,7 +19,8 @@ EXTRA_DIST = \
Makefile.lite \
test_seeking.dsp
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
if FLaC__HAS_OGG
......
......@@ -19,8 +19,6 @@ EXTRA_DIST = \
Makefile.lite \
test_streams.dsp
CFLAGS = @CFLAGS@
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \
main.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment