# HG changeset patch
# User Paul Brossier <piem@piem.org>
# Date 1469137266 -7200
# Node ID e32a58a8027197ab6d5919ea18725a1649e93614
# Parent  4dd52e54ce4398bac6a44ac01e26c79da54a0e20
Makefile.linux: use same locations as for scripts/get_aubio.sh, scripts/get_deps*

diff -r 4dd52e54ce43 -r e32a58a80271 Makefile.linux
--- a/Makefile.linux	Thu Jul 21 23:11:27 2016 +0200
+++ b/Makefile.linux	Thu Jul 21 23:41:06 2016 +0200
@@ -11,13 +11,15 @@
 
 # ... or for a release build
 CFLAGS		:= -Wall -Wextra -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC
+CFLAGS += -I./contrib/aubio-dist/include
+LDFLAGS += -L./contrib/aubio-dist/lib
 
 # Location of Vamp plugin SDK relative to the project directory
-VAMPSDK_DIR	:= ../vamp-plugin-sdk-2.5
+VAMPSDK_DIR	:= ./contrib/vamp-plugin-sdk-2.6
 
 # Location of libvamp-sdk.a
-VAMPBIN_DIR_LINUX64 ?= ../vamp-plugin-sdk-2.5-binaries-amd64-linux
-VAMPBIN_DIR_LINUX32 ?= ../vamp-plugin-sdk-2.5-binaries-i686-linux
+VAMPBIN_DIR_LINUX64 ?= ./contrib/vamp-plugin-sdk-2.6-binaries-amd64-linux
+VAMPBIN_DIR_LINUX32 ?= ./contrib/vamp-plugin-sdk-2.6-binaries-i686-linux
 
 # Libraries and linker flags required by plugin: add any -l<library>
 # options here