Changeset 17db1cd

Timestamp:

Sep 29, 2006, 4:15:56 PM (18 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

5a405dd

Parents:

8a1f9a4

Message:

use AUBIO_CFLAGS, not CFLAGS
use AUBIO_CFLAGS, not CFLAGS

Files:

• configure.ac (modified) (5 diffs)
• examples/Makefile.am (modified) (1 diff)
• ext/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

configure.ac

@@ -29 +29 @@
 fi
 AC_PROG_INSTALL
+
+AUBIO_CFLAGS=
 
 dnl Enable debugging (no)
@@ -38 +40 @@
 then
   AC_DEFINE(DEBUG,1,[Define to enable debug])
-  CFLAGS="$CFLAGS -g"
+  AUBIO_CFLAGS="$(AUBIO_CFLAGS) -g"
 fi
 
@@ -54 +56 @@
   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
@@ -66 +69 @@
   [  --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
@@ -85 +88 @@
   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
   ;;

examples/Makefile.am

@@ -4 +4 @@
 
 # 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

ext/Makefile.am

@@ -43 +43 @@
         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@

src/Makefile.am

@@ -71 +71 @@
         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@