summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-01 22:41:11 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 01:48:48 +0200
commitc0f567d3232cbe165e56cb2684cda52df7cfb90f (patch)
tree3ffbe6df3f2056fd579a954e00f0bea49b47104e /src
parent9eadae8edc7a35f87499f58c3e3b9cec68f74a80 (diff)
downloadingen-c0f567d3232cbe165e56cb2684cda52df7cfb90f.tar.gz
ingen-c0f567d3232cbe165e56cb2684cda52df7cfb90f.tar.bz2
ingen-c0f567d3232cbe165e56cb2684cda52df7cfb90f.zip
Move public headers to a separate include directory
This is more conventional and probably best practice (since it avoids polluting the include path with non-headers), and is supported by the clang-tidy llvm-header-guard check.
Diffstat (limited to 'src')
-rw-r--r--src/client/wscript4
-rw-r--r--src/gui/wscript6
-rw-r--r--src/server/wscript10
-rw-r--r--src/wscript4
4 files changed, 12 insertions, 12 deletions
diff --git a/src/client/wscript b/src/client/wscript
index 394c9e4d..c9d6044f 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -4,8 +4,8 @@
def build(bld):
obj = bld(features = 'cxx cxxshlib',
cflags = ['-fvisibility=hidden'],
- includes = ['../..'],
- export_includes = ['../..'],
+ includes = ['../../include'],
+ export_includes = ['../../include'],
name = 'libingen_client',
target = 'ingen_client',
install_path = '${LIBDIR}',
diff --git a/src/gui/wscript b/src/gui/wscript
index b33bd31e..46216adb 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -42,8 +42,8 @@ def configure(conf):
def build(bld):
obj = bld(features = 'cxx cxxshlib',
cflags = ['-fvisibility=hidden'],
- export_includes = ['../..'],
- includes = ['../..'],
+ export_includes = ['../../include'],
+ includes = ['../../include'],
name = 'libingen_gui',
target = 'ingen_gui',
install_path = '${LIBDIR}',
@@ -119,7 +119,7 @@ def build(bld):
obj = bld(features = 'cxx cxxshlib',
cflags = ['-fvisibility=hidden'],
source = 'ingen_gui_lv2.cpp',
- includes = ['.', '../..'],
+ includes = ['.', '../../include'],
name = 'ingen_gui_lv2',
target = 'ingen_gui_lv2',
install_path = '${LV2DIR}/ingen.lv2/',
diff --git a/src/server/wscript b/src/server/wscript
index 00588915..7e9ad2d6 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -57,8 +57,8 @@ def build(bld):
bld(features = 'cxx cxxshlib',
source = core_source,
- export_includes = ['../..'],
- includes = ['.', '../..'],
+ export_includes = ['../../include'],
+ includes = ['.', '../../include'],
name = 'libingen_server',
target = 'ingen_server',
install_path = '${LIBDIR}',
@@ -70,7 +70,7 @@ def build(bld):
if bld.env.HAVE_JACK:
bld(features = 'cxx cxxshlib',
source = 'JackDriver.cpp ingen_jack.cpp',
- includes = ['.', '../..'],
+ includes = ['.', '../../include'],
name = 'libingen_jack',
target = 'ingen_jack',
install_path = '${LIBDIR}',
@@ -82,7 +82,7 @@ def build(bld):
if bld.env.HAVE_PORTAUDIO:
bld(features = 'cxx cxxshlib',
source = 'PortAudioDriver.cpp ingen_portaudio.cpp',
- includes = ['.', '../..'],
+ includes = ['.', '../../include'],
name = 'libingen_portaudio',
target = 'ingen_portaudio',
install_path = '${LIBDIR}',
@@ -96,7 +96,7 @@ def build(bld):
bld(features = 'cxx cxxshlib',
source = ' ingen_lv2.cpp ',
cflags = ['-fvisibility=hidden'],
- includes = ['.', '../..'],
+ includes = ['../../include'],
name = 'libingen_lv2',
target = 'ingen_lv2',
install_path = '${LV2DIR}/ingen.lv2/',
diff --git a/src/wscript b/src/wscript
index 72c7d48c..ba55572e 100644
--- a/src/wscript
+++ b/src/wscript
@@ -34,8 +34,8 @@ def build(bld):
bld(features = 'cxx cxxshlib',
source = sources,
- export_includes = ['..'],
- includes = ['..'],
+ export_includes = ['../include'],
+ includes = ['../include'],
name = 'libingen',
target = 'ingen-%s' % bld.env.INGEN_MAJOR_VERSION,
vnum = bld.env.INGEN_VERSION,