diff options
| -rw-r--r-- | include/lilv/lilv.h (renamed from lilv/lilv.h) | 0 | ||||
| -rw-r--r-- | include/lilv/lilvmm.hpp (renamed from lilv/lilvmm.hpp) | 0 | ||||
| -rw-r--r-- | wscript | 22 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lilv/lilv.h b/include/lilv/lilv.h index 8c9ee22..8c9ee22 100644 --- a/lilv/lilv.h +++ b/include/lilv/lilv.h diff --git a/lilv/lilvmm.hpp b/include/lilv/lilvmm.hpp index 011c9c8..011c9c8 100644 --- a/lilv/lilvmm.hpp +++ b/include/lilv/lilvmm.hpp @@ -285,7 +285,7 @@ def configure(conf): def build_util(bld, name, defines, libs=''): obj = bld(features = 'c cprogram', source = name + '.c', - includes = ['.', './src', './utils'], + includes = ['include', './src', './utils'], use = 'liblilv', uselib = 'SERD SORD SRATOM LV2 ' + libs, target = name, @@ -304,8 +304,8 @@ def build_util(bld, name, defines, libs=''): def build(bld): # C/C++ Headers includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION - bld.install_files(includedir, bld.path.ant_glob('lilv/*.h')) - bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp')) + bld.install_files(includedir, bld.path.ant_glob('include/lilv/*.h')) + bld.install_files(includedir, bld.path.ant_glob('include/lilv/*.hpp')) lib_source = ''' src/collections.c @@ -344,9 +344,9 @@ def build(bld): # Shared Library if bld.env.BUILD_SHARED: obj = bld(features = 'c cshlib', - export_includes = ['.'], + export_includes = ['include'], source = lib_source, - includes = ['.', './src'], + includes = ['include', './src'], name = 'liblilv', target = 'lilv-%s' % LILV_MAJOR_VERSION, vnum = LILV_VERSION, @@ -359,9 +359,9 @@ def build(bld): # Static library if bld.env.BUILD_STATIC: obj = bld(features = 'c cstlib', - export_includes = ['.'], + export_includes = ['include'], source = lib_source, - includes = ['.', './src'], + includes = ['include', './src'], name = 'liblilv_static', target = 'lilv-%s' % LILV_MAJOR_VERSION, vnum = LILV_VERSION, @@ -419,7 +419,7 @@ def build(bld): obj = bld(features = 'c cprogram', source = 'test/%s.lv2/test_%s.c' % (p, p), target = 'test/test_%s' % p, - includes = ['.', './src'], + includes = ['include', './src'], use = 'liblilv_profiled', install_path = None, defines = defines, @@ -441,7 +441,7 @@ def build(bld): # Static profiled library (for unit test code coverage) obj = bld(features = 'c cstlib', source = lib_source, - includes = ['.', './src'], + includes = ['include', './src'], name = 'liblilv_profiled', target = 'lilv_profiled', install_path = None, @@ -460,7 +460,7 @@ def build(bld): obj = bld(features = 'c cprogram', source = ['test/%s.c' % test, 'test/lilv_test_utils.c'], - includes = ['.', './src'], + includes = ['include', './src'], use = 'liblilv_profiled', lib = test_libs, uselib = 'SERD SORD SRATOM LV2', @@ -476,7 +476,7 @@ def build(bld): if 'COMPILER_CXX' in bld.env: obj = bld(features = 'cxx cxxprogram', source = 'test/lilv_cxx_test.cpp', - includes = ['.', './src'], + includes = ['include', './src'], use = 'liblilv_profiled', lib = test_libs, uselib = 'SERD SORD SRATOM LV2', |