Build blop.lv2 in top-level build process.

git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/blop.lv2@4570 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 9 insertions, 9 deletions

diff --git a/src/wavedata.c b/src/wavedata.c
index e76047e..c0ae602 100644
--- a/src/wavedata.c
+++ b/src/wavedata.c
@@ -37,13 +37,13 @@ wavedata_load(Wavedata*   w,
 {
 	const size_t bundle_len   = strlen(bundle_path);
 	const size_t lib_name_len = strlen(lib_name);
-	const size_t ext_len      = strlen(BLIP_SHLIB_EXT);
+	const size_t ext_len      = strlen(BLOP_SHLIB_EXT);
 	const size_t path_len     = bundle_len + lib_name_len + ext_len + 2;
 	int          retval       = -1;
 
 	char* lib_path = malloc(path_len);
 	snprintf(lib_path, path_len, "%s%s%s",
-	         bundle_path, lib_name, BLIP_SHLIB_EXT);
+	         bundle_path, lib_name, BLOP_SHLIB_EXT);
 
 	void* handle = dlopen(lib_path, RTLD_NOW);
 	free(lib_path);
diff --git a/wscript b/wscript
index 1a88c05..0c656c5 100644
--- a/wscript
+++ b/wscript
@@ -5,11 +5,11 @@ import subprocess
 from waflib.extras import autowaf as autowaf
 
 # Version of this package (even if built as a child)
-BLIP_VERSION = '0.0.0'
+BLOP_VERSION = '0.0.0'
 
 # Variables for 'waf dist'
 APPNAME = 'blop.lv2'
-VERSION = BLIP_VERSION
+VERSION = BLOP_VERSION
 
 # Mandatory variables
 top = '.'
@@ -22,7 +22,7 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
-    autowaf.display_header('Blip Configuration')
+    autowaf.display_header('Blop.LV2 Configuration')
 
     conf.env.append_unique('CFLAGS', '-std=c99')
 
@@ -43,7 +43,7 @@ def configure(conf):
     conf.env['pluginlib_PATTERN'] = pat
     conf.env['pluginlib_EXT'] = pat[pat.rfind('.'):]
 
-    conf.define('BLIP_SHLIB_EXT', conf.env['pluginlib_EXT'])
+    conf.define('BLOP_SHLIB_EXT', conf.env['pluginlib_EXT'])
 
     autowaf.display_msg(conf, "LV2 bundle directory",
                         conf.env['LV2DIR'])
@@ -56,7 +56,7 @@ def build_plugin(bld, lang, bundle, name, source, cflags=[], libs=[]):
     obj              = bld(features = '%s %sshlib' % (lang,lang))
     obj.env          = penv
     obj.source       = source
-    obj.includes     = [ '.', './src/include' ]
+    obj.includes     = [ '.', 'src/include' ]
     obj.name         = name
     obj.target       = os.path.join(bundle, name)
     obj.uselib       = ['LV2']
@@ -145,7 +145,7 @@ def build(bld):
                   target       = 'src/wavegen',
                   name         = 'wavegen',
                   after        = ['parabola', 'sawtooth', 'square'],
-                  includes     = ['./src', './src/include'],
+                  includes     = ['.', 'src/include'],
                   lib          = ['m'],
                   install_path = None)
 
@@ -164,7 +164,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = bld.path.get_bld().make_node('src/%s_data.c' % i),
                   target       = 'blop.lv2/%s_data' % i,
-                  includes     = ['./src', './src/include'],
+                  includes     = ['.', 'src/include'],
                   env          = penv,
                   install_path = '${LV2DIR}/blop.lv2')