From 858cfa7b34a9a932edd72c56297ddd19e5a8a6f7 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 17 Oct 2009 14:15:32 +0200 Subject: [PATCH] remove references to aubioext in Makefile.am --- interfaces/java/aubio/Makefile.am | 3 +-- tests/src/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interfaces/java/aubio/Makefile.am b/interfaces/java/aubio/Makefile.am index 08e2e33b..ead43cc4 100644 --- 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 @@ 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 diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index e40f739c..78fa603e 100644 --- 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 \ -- 2.26.2