remove references to aubioext in Makefile.am
authorPaul Brossier <piem@piem.org>
Sat, 17 Oct 2009 12:15:32 +0000 (14:15 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 17 Oct 2009 12:15:32 +0000 (14:15 +0200)
interfaces/java/aubio/Makefile.am
tests/src/Makefile.am

index 08e2e33b2eaefa8e54eed6748ac217fc559a07f7..ead43cc42724cc19d04c73b8d475684d67c82139 100644 (file)
@@ -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 @@ AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \
 SWLDFLAGS = -shared
 
 AUBIO_LDFLAGS = $(SWLDFLAGS) \
-       -L$(top_builddir)/ext -laubioext \
        -L$(top_builddir)/src -laubio
 
 pkgjavadir = ${libdir}/java/aubio
index e40f739cd4ecb6ecdf62a461e4bdc33d0a8ac43e..78fa603e66c607a1458ee2f84a0a7924c290da96 100644 (file)
@@ -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 \