From 9dde86917946bfbba97456bc42ca43045fc950e9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 25 Jan 2008 19:20:49 +0000 Subject: [PATCH] rearrange vamp plugins to allow proper library dependencies to be expressed git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2968 d708f5d6-7413-0410-9779-e7cbd77b26cf --- .../AmplitudeFollower.cpp | 0 .../AmplitudeFollower.h | 0 .../PercussionOnsetDetector.cpp | 0 .../PercussionOnsetDetector.h | 0 libs/vamp-plugins/SConscript | 26 +++++++++++++++++++ .../SpectralCentroid.cpp | 0 .../SpectralCentroid.h | 0 .../plugins => vamp-plugins}/ZeroCrossing.cpp | 0 .../plugins => vamp-plugins}/ZeroCrossing.h | 0 .../plugins => vamp-plugins}/plugins.cpp | 0 libs/vamp-sdk/SConscript | 7 ----- 11 files changed, 26 insertions(+), 7 deletions(-) rename libs/{vamp-sdk/plugins => vamp-plugins}/AmplitudeFollower.cpp (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/AmplitudeFollower.h (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/PercussionOnsetDetector.cpp (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/PercussionOnsetDetector.h (100%) create mode 100644 libs/vamp-plugins/SConscript rename libs/{vamp-sdk/plugins => vamp-plugins}/SpectralCentroid.cpp (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/SpectralCentroid.h (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/ZeroCrossing.cpp (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/ZeroCrossing.h (100%) rename libs/{vamp-sdk/plugins => vamp-plugins}/plugins.cpp (100%) diff --git a/libs/vamp-sdk/plugins/AmplitudeFollower.cpp b/libs/vamp-plugins/AmplitudeFollower.cpp similarity index 100% rename from libs/vamp-sdk/plugins/AmplitudeFollower.cpp rename to libs/vamp-plugins/AmplitudeFollower.cpp diff --git a/libs/vamp-sdk/plugins/AmplitudeFollower.h b/libs/vamp-plugins/AmplitudeFollower.h similarity index 100% rename from libs/vamp-sdk/plugins/AmplitudeFollower.h rename to libs/vamp-plugins/AmplitudeFollower.h diff --git a/libs/vamp-sdk/plugins/PercussionOnsetDetector.cpp b/libs/vamp-plugins/PercussionOnsetDetector.cpp similarity index 100% rename from libs/vamp-sdk/plugins/PercussionOnsetDetector.cpp rename to libs/vamp-plugins/PercussionOnsetDetector.cpp diff --git a/libs/vamp-sdk/plugins/PercussionOnsetDetector.h b/libs/vamp-plugins/PercussionOnsetDetector.h similarity index 100% rename from libs/vamp-sdk/plugins/PercussionOnsetDetector.h rename to libs/vamp-plugins/PercussionOnsetDetector.h diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript new file mode 100644 index 0000000000..592fca3768 --- /dev/null +++ b/libs/vamp-plugins/SConscript @@ -0,0 +1,26 @@ +# -*- python -*- + +import os +import os.path +import glob + +plugin_files = glob.glob ("*.cpp") + +Import('env install_prefix libraries') +vampplugs = env.Copy() + +vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk") +vampplugs.Merge ([libraries['vamp'], + libraries['vamphost'] + ]) + +libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', plugin_files) + +Default(libvampplugins) + +env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins)) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'COPYING', 'README' ] + + plugin_files + + glob.glob('*.h'))) diff --git a/libs/vamp-sdk/plugins/SpectralCentroid.cpp b/libs/vamp-plugins/SpectralCentroid.cpp similarity index 100% rename from libs/vamp-sdk/plugins/SpectralCentroid.cpp rename to libs/vamp-plugins/SpectralCentroid.cpp diff --git a/libs/vamp-sdk/plugins/SpectralCentroid.h b/libs/vamp-plugins/SpectralCentroid.h similarity index 100% rename from libs/vamp-sdk/plugins/SpectralCentroid.h rename to libs/vamp-plugins/SpectralCentroid.h diff --git a/libs/vamp-sdk/plugins/ZeroCrossing.cpp b/libs/vamp-plugins/ZeroCrossing.cpp similarity index 100% rename from libs/vamp-sdk/plugins/ZeroCrossing.cpp rename to libs/vamp-plugins/ZeroCrossing.cpp diff --git a/libs/vamp-sdk/plugins/ZeroCrossing.h b/libs/vamp-plugins/ZeroCrossing.h similarity index 100% rename from libs/vamp-sdk/plugins/ZeroCrossing.h rename to libs/vamp-plugins/ZeroCrossing.h diff --git a/libs/vamp-sdk/plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp similarity index 100% rename from libs/vamp-sdk/plugins/plugins.cpp rename to libs/vamp-plugins/plugins.cpp diff --git a/libs/vamp-sdk/SConscript b/libs/vamp-sdk/SConscript index f8a25112a1..f6a27288f9 100644 --- a/libs/vamp-sdk/SConscript +++ b/libs/vamp-sdk/SConscript @@ -19,8 +19,6 @@ vamp-sdk/hostext/PluginWrapper.cpp vamp-sdk/RealTime.cpp """) -plugin_files = glob.glob ("plugins/*.cpp") - Import('env install_prefix libraries') vampsdk = env.Copy() @@ -28,22 +26,17 @@ vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk") libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files) libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files) -libvampplugins = vampsdk.SharedLibrary('ardourvampplugins', plugin_files) Default(libvampsdk) Default(libvamphostsdk) -Default(libvampplugins) env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvampsdk)) env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvamphostsdk)) -env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'COPYING', 'README' ] + vampsdk_files + vamphostsdk_files + - plugin_files + glob.glob('vamp/*.h') + - glob.glob('plugins/*.h') + glob.glob('vamp-sdk/*.h') + glob.glob('vamp-sdk/hostext/*.h')))