cpp/Makefile.am: use CPPFLAGS for cpp lib, fix up includes

diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 2bc064dcd405056622e430bd3fc5620fd0c6a088..1cf7e751b4b4d1f10a0e8df1f56a5c4a261c7031 100644 (file)
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -2,6 +2,6 @@ pkginclude_HEADERS = aubiocpp.h
 
 lib_LTLIBRARIES = libaubiocpp.la 
 libaubiocpp_la_SOURCES = aubiocpp.cpp
-AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
 libaubiocpp_la_LIBADD  = -laubio -L${top_builddir}/src @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
 libaubiocpp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@