summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sord/sord.h (renamed from sord/sord.h)0
-rw-r--r--include/sord/sordmm.hpp (renamed from sord/sordmm.hpp)0
-rw-r--r--wscript22
3 files changed, 11 insertions, 11 deletions
diff --git a/sord/sord.h b/include/sord/sord.h
index 4665b50..4665b50 100644
--- a/sord/sord.h
+++ b/include/sord/sord.h
diff --git a/sord/sordmm.hpp b/include/sord/sordmm.hpp
index 1cb34e7..1cb34e7 100644
--- a/sord/sordmm.hpp
+++ b/include/sord/sordmm.hpp
diff --git a/wscript b/wscript
index 137d2bd..a1a15a7 100644
--- a/wscript
+++ b/wscript
@@ -165,8 +165,8 @@ def configure(conf):
def build(bld):
# C/C++ Headers
includedir = '${INCLUDEDIR}/sord-%s/sord' % SORD_MAJOR_VERSION
- bld.install_files(includedir, bld.path.ant_glob('sord/*.h'))
- bld.install_files(includedir, bld.path.ant_glob('sord/*.hpp'))
+ bld.install_files(includedir, bld.path.ant_glob('include/sord/*.h'))
+ bld.install_files(includedir, bld.path.ant_glob('include/sord/*.hpp'))
# Pkgconfig file
autowaf.build_pc(bld, 'SORD', SORD_VERSION, SORD_MAJOR_VERSION, [],
@@ -187,8 +187,8 @@ def build(bld):
if bld.env.BUILD_SHARED:
obj = bld(features = 'c cshlib',
source = source,
- includes = ['.', './src'],
- export_includes = ['.'],
+ includes = ['include', './src'],
+ export_includes = ['include'],
name = 'libsord',
target = 'sord-%s' % SORD_MAJOR_VERSION,
vnum = SORD_VERSION,
@@ -202,8 +202,8 @@ def build(bld):
if bld.env.BUILD_STATIC:
obj = bld(features = 'c cstlib',
source = source,
- includes = ['.', './src'],
- export_includes = ['.'],
+ includes = ['include', './src'],
+ export_includes = ['include'],
name = 'libsord_static',
target = 'sord-%s' % SORD_MAJOR_VERSION,
vnum = SORD_VERSION,
@@ -223,7 +223,7 @@ def build(bld):
# Profiled static library for test coverage
obj = bld(features = 'c cstlib',
source = source,
- includes = ['.', './src'],
+ includes = ['include', './src'],
name = 'libsord_profiled',
target = 'sord_profiled',
install_path = '',
@@ -236,7 +236,7 @@ def build(bld):
# Unit test program
obj = bld(features = 'c cprogram',
source = 'src/sord_test.c',
- includes = ['.', './src'],
+ includes = ['include', './src'],
use = 'libsord_profiled',
lib = test_libs,
target = 'sord_test',
@@ -249,7 +249,7 @@ def build(bld):
# Static profiled sordi for tests
obj = bld(features = 'c cprogram',
source = 'src/sordi.c',
- includes = ['.', './src'],
+ includes = ['include', './src'],
use = 'libsord_profiled',
lib = test_libs,
target = 'sordi_static',
@@ -263,7 +263,7 @@ def build(bld):
if bld.env.COMPILER_CXX:
obj = bld(features = 'cxx cxxprogram',
source = 'src/sordmm_test.cpp',
- includes = ['.', './src'],
+ includes = ['include', './src'],
use = 'libsord_profiled',
lib = test_libs,
target = 'sordmm_test',
@@ -281,7 +281,7 @@ def build(bld):
for i in utils:
obj = bld(features = 'c cprogram',
source = 'src/%s.c' % i,
- includes = ['.', './src'],
+ includes = ['include', './src'],
use = 'libsord',
lib = libs,
uselib = 'SERD',