From 17db1cde81719f3e7b3c85179d40105df19c209b Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Fri, 29 Sep 2006 14:15:56 +0000 Subject: [PATCH] use AUBIO_CFLAGS, not CFLAGS use AUBIO_CFLAGS, not CFLAGS --- configure.ac | 13 ++++++++----- examples/Makefile.am | 3 +-- ext/Makefile.am | 2 +- src/Makefile.am | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index e248b4e9..e3937781 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,8 @@ if test "$ac_cv_prog_cc" = "no" ; then fi AC_PROG_INSTALL +AUBIO_CFLAGS= + dnl Enable debugging (no) AC_ARG_ENABLE(debug, [ --enable-debug[[=value]] compile with debug [[default=no]]], @@ -37,7 +39,7 @@ AC_ARG_ENABLE(debug, if test "$with_debug" = "yes" then AC_DEFINE(DEBUG,1,[Define to enable debug]) - CFLAGS="$CFLAGS -g" + AUBIO_CFLAGS="$(AUBIO_CFLAGS) -g" fi dnl Enable full warnings (yes) @@ -53,19 +55,20 @@ then CFLAGS="$CFLAGS -Wextra" AC_COMPILE_IFELSE([void foo (void) {}], ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no) + CFLAGS="$old_CFLAGS" ]) if test "$ac_cv_cc_wextra" = "yes" then - CFLAGS="$old_CFLAGS -Wall -Wextra" + AUBIO_CFLAGS="$AUBIO_CFLAGS -Wall -Wextra" else - CFLAGS="$old_CFLAGS -Wall" + AUBIO_CFLAGS="$AUBIO_CFLAGS -Wall" fi fi AC_ARG_ENABLE(failonerror, [ --enable-fwarn[[=value]] fail on compilation warnings [[default=yes]]], with_warnme="no", - CFLAGS="$CFLAGS -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-unused-parameter") + AUBIO_CFLAGS="$AUBIO_CFLAGS -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-unused-parameter") dnl Check for libtool AC_LIBTOOL_DLOPEN @@ -84,7 +87,7 @@ case "${host_os}" in dnl on macosx, cosf went to -lmx LDFLAGS="$LDFLAGS -lmx" dnl as long double doesn't sit well with -Wall -Werror - CFLAGS="$CFLAGS -Wno-long-double" + AUBIO_CFLAGS="$AUBIO_CFLAGS -Wno-long-double" AC_ISC_POSIX ;; *) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7ef72728..94a20f11 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,9 +3,8 @@ SUBDIRS = tests endif # global flags -AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ +AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ -#AM_SOURCES = utils.c # add your programs to this list bin_PROGRAMS = \ diff --git a/ext/Makefile.am b/ext/Makefile.am index 65c20122..20d59111 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -42,6 +42,6 @@ libaubioext_la_SOURCES = aubioext.h \ midi/midi_driver.h \ midi/midi_driver.c -AM_CFLAGS = -I$(top_srcdir)/src @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ +AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ libaubioext_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LTLIBOBJS@ libaubioext_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/src/Makefile.am b/src/Makefile.am index 8de3f56c..1ca5d68f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,6 +70,6 @@ libaubio_la_SOURCES = aubio.h \ filter.c \ filter.h -AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ +AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@ libaubio_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ -- 2.26.2