ref: 858cfa7b34a9a932edd72c56297ddd19e5a8a6f7
parent: 740f06b69a354c22dd92e9ca2d371fc93f259604
author: Paul Brossier <[email protected]>
date: Sat Oct 17 10:15:32 EDT 2009
remove references to aubioext in Makefile.am
--- a/interfaces/java/aubio/Makefile.am
+++ b/interfaces/java/aubio/Makefile.am
@@ -1,7 +1,7 @@
NOWARN_CFLAGS = -Wno-strict-aliasing
AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \
- -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/ext \
+ -I$(top_builddir)/src -I$(top_srcdir)/src \
-I/usr/lib/jvm/java-6-sun-1.6.0.04/include \
-I${prefix}/lib/jvm/java-6-sun-1.6.0.04/include \-I/usr/lib/jvm/java-6-sun-1.6.0.04/include/linux \
@@ -12,7 +12,6 @@
SWLDFLAGS = -shared
AUBIO_LDFLAGS = $(SWLDFLAGS) \
- -L$(top_builddir)/ext -laubioext \
-L$(top_builddir)/src -laubio
pkgjavadir = ${libdir}/java/aubio--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,8 +1,8 @@
AM_CFLAGS = -I$(top_srcdir)/src
AM_LDFLAGS = -L$(top_builddir)/src -laubio @FFTWLIB_LIBS@
-test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/ext @JACK_CFLAGS@
-test_phasevoc_jack_LDADD = $(AM_LDFLAGS) -laubioext -L$(top_builddir)/ext @JACK_LIBS@
+test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) @JACK_CFLAGS@
+test_phasevoc_jack_LDADD = $(AM_LDFLAGS) @JACK_LIBS@
bin_PROGRAMS = \
test-fft \