From e103a630847a401523074ce1023134f09668519b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 20 Apr 2019 19:14:02 +0200 Subject: Fix building within a recursive project --- plugins/eg-metro.lv2/wscript | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'plugins/eg-metro.lv2/wscript') diff --git a/plugins/eg-metro.lv2/wscript b/plugins/eg-metro.lv2/wscript index e91e21f..13b09aa 100644 --- a/plugins/eg-metro.lv2/wscript +++ b/plugins/eg-metro.lv2/wscript @@ -20,8 +20,7 @@ def configure(conf): conf.load('lv2', cache=True) conf.load('autowaf', cache=True) - if not autowaf.is_child(): - autowaf.check_pkg(conf, 'lv2', atleast_version='0.2.0', uselib_store='LV2') + autowaf.check_pkg(conf, 'lv2', atleast_version='0.2.0', uselib_store='LV2') conf.check(features='c cshlib', lib='m', uselib_store='M', mandatory=False) @@ -46,17 +45,11 @@ def build(bld): target = '%s/metro.ttl' % bundle, install_path = '${LV2DIR}/%s' % bundle) - # Use LV2 headers from parent directory if building as a sub-project - includes = ['.'] - if autowaf.is_child: - includes += ['../..'] - # Build plugin library obj = bld(features = 'c cshlib', source = 'metro.c', name = 'metro', target = '%s/metro' % bundle, install_path = '${LV2DIR}/%s' % bundle, - use = ['M', 'LV2'], - includes = includes) + use = ['M', 'LV2']) obj.env.cshlib_PATTERN = module_pat -- cgit v1.2.1