diff --git a/configure b/configure index 0f5220364..5f42f3079 100755 --- a/configure +++ b/configure @@ -7681,7 +7681,7 @@ fi LIBVAMP_LOCAL_AVAILABLE="yes" LIBVAMP_LOCAL_BUILD="vamp-sdk" LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp' - LIBVAMP_LOCAL_LDFLAGS='-L$(top_builddir)/lib-src/libvamp/src -lvamp-hostsdk' + LIBVAMP_LOCAL_LIBS="libvamp-hostsdk.a" LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o" LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP" LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs" diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 7a7a44dde..68a6c073f 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -58,6 +58,8 @@ libnyquist.a: libnyquist-recursive # vamp-sdk: $(MAKE) -C libvamp sdkstatic +libvamp-hostsdk.a: vamp-sdk + ln -sf libvamp/libvamp-hostsdk.a libvamp-hostsdk.a # libtwolame libtwolame-recursive: diff --git a/m4/audacity_checklib_libvamp.m4 b/m4/audacity_checklib_libvamp.m4 index aca616506..f4d5e1320 100644 --- a/m4/audacity_checklib_libvamp.m4 +++ b/m4/audacity_checklib_libvamp.m4 @@ -47,7 +47,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [ LIBVAMP_LOCAL_BUILD="vamp-sdk" dnl compiler and linker flags LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp' - LIBVAMP_LOCAL_LDFLAGS='-L$(top_builddir)/lib-src/libvamp/src -lvamp-hostsdk' + LIBVAMP_LOCAL_LIBS="libvamp-hostsdk.a" dnl add some extra object files we can build LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o" dnl define a pre-processor symbol to tell other code that the vamp host