summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clang-tidy2
-rw-r--r--include/ingen/Arc.hpp (renamed from ingen/Arc.hpp)0
-rw-r--r--include/ingen/Atom.hpp (renamed from ingen/Atom.hpp)0
-rw-r--r--include/ingen/AtomForge.hpp (renamed from ingen/AtomForge.hpp)0
-rw-r--r--include/ingen/AtomReader.hpp (renamed from ingen/AtomReader.hpp)0
-rw-r--r--include/ingen/AtomSink.hpp (renamed from ingen/AtomSink.hpp)0
-rw-r--r--include/ingen/AtomWriter.hpp (renamed from ingen/AtomWriter.hpp)0
-rw-r--r--include/ingen/ClashAvoider.hpp (renamed from ingen/ClashAvoider.hpp)0
-rw-r--r--include/ingen/Clock.hpp (renamed from ingen/Clock.hpp)0
-rw-r--r--include/ingen/ColorContext.hpp (renamed from ingen/ColorContext.hpp)0
-rw-r--r--include/ingen/Configuration.hpp (renamed from ingen/Configuration.hpp)0
-rw-r--r--include/ingen/DataAccess.hpp (renamed from ingen/DataAccess.hpp)0
-rw-r--r--include/ingen/EngineBase.hpp (renamed from ingen/EngineBase.hpp)0
-rw-r--r--include/ingen/FilePath.hpp (renamed from ingen/FilePath.hpp)0
-rw-r--r--include/ingen/Forge.hpp (renamed from ingen/Forge.hpp)0
-rw-r--r--include/ingen/InstanceAccess.hpp (renamed from ingen/InstanceAccess.hpp)0
-rw-r--r--include/ingen/Interface.hpp (renamed from ingen/Interface.hpp)0
-rw-r--r--include/ingen/LV2Features.hpp (renamed from ingen/LV2Features.hpp)0
-rw-r--r--include/ingen/Library.hpp (renamed from ingen/Library.hpp)0
-rw-r--r--include/ingen/Log.hpp (renamed from ingen/Log.hpp)0
-rw-r--r--include/ingen/Message.hpp (renamed from ingen/Message.hpp)0
-rw-r--r--include/ingen/Module.hpp (renamed from ingen/Module.hpp)0
-rw-r--r--include/ingen/Node.hpp (renamed from ingen/Node.hpp)0
-rw-r--r--include/ingen/Parser.hpp (renamed from ingen/Parser.hpp)0
-rw-r--r--include/ingen/Properties.hpp (renamed from ingen/Properties.hpp)0
-rw-r--r--include/ingen/QueuedInterface.hpp (renamed from ingen/QueuedInterface.hpp)0
-rw-r--r--include/ingen/Resource.hpp (renamed from ingen/Resource.hpp)0
-rw-r--r--include/ingen/Serialiser.hpp (renamed from ingen/Serialiser.hpp)0
-rw-r--r--include/ingen/SocketReader.hpp (renamed from ingen/SocketReader.hpp)0
-rw-r--r--include/ingen/SocketWriter.hpp (renamed from ingen/SocketWriter.hpp)0
-rw-r--r--include/ingen/Status.hpp (renamed from ingen/Status.hpp)0
-rw-r--r--include/ingen/Store.hpp (renamed from ingen/Store.hpp)0
-rw-r--r--include/ingen/StreamWriter.hpp (renamed from ingen/StreamWriter.hpp)0
-rw-r--r--include/ingen/Tee.hpp (renamed from ingen/Tee.hpp)0
-rw-r--r--include/ingen/TurtleWriter.hpp (renamed from ingen/TurtleWriter.hpp)0
-rw-r--r--include/ingen/URI.hpp (renamed from ingen/URI.hpp)0
-rw-r--r--include/ingen/URIMap.hpp (renamed from ingen/URIMap.hpp)0
-rw-r--r--include/ingen/URIs.hpp (renamed from ingen/URIs.hpp)0
-rw-r--r--include/ingen/World.hpp (renamed from ingen/World.hpp)0
-rw-r--r--include/ingen/client/ArcModel.hpp (renamed from ingen/client/ArcModel.hpp)0
-rw-r--r--include/ingen/client/BlockModel.hpp (renamed from ingen/client/BlockModel.hpp)0
-rw-r--r--include/ingen/client/ClientStore.hpp (renamed from ingen/client/ClientStore.hpp)0
-rw-r--r--include/ingen/client/GraphModel.hpp (renamed from ingen/client/GraphModel.hpp)0
-rw-r--r--include/ingen/client/ObjectModel.hpp (renamed from ingen/client/ObjectModel.hpp)0
-rw-r--r--include/ingen/client/PluginModel.hpp (renamed from ingen/client/PluginModel.hpp)0
-rw-r--r--include/ingen/client/PluginUI.hpp (renamed from ingen/client/PluginUI.hpp)0
-rw-r--r--include/ingen/client/PortModel.hpp (renamed from ingen/client/PortModel.hpp)0
-rw-r--r--include/ingen/client/SigClientInterface.hpp (renamed from ingen/client/SigClientInterface.hpp)0
-rw-r--r--include/ingen/client/SocketClient.hpp (renamed from ingen/client/SocketClient.hpp)0
-rw-r--r--include/ingen/client/signal.hpp (renamed from ingen/client/signal.hpp)0
-rw-r--r--include/ingen/filesystem.hpp (renamed from ingen/filesystem.hpp)0
-rw-r--r--include/ingen/fmt.hpp (renamed from ingen/fmt.hpp)0
-rw-r--r--include/ingen/ingen.h (renamed from ingen/ingen.h)0
-rw-r--r--include/ingen/paths.hpp (renamed from ingen/paths.hpp)0
-rw-r--r--include/ingen/runtime_paths.hpp (renamed from ingen/runtime_paths.hpp)0
-rw-r--r--include/ingen/types.hpp (renamed from ingen/types.hpp)0
-rw-r--r--src/client/wscript4
-rw-r--r--src/gui/wscript6
-rw-r--r--src/server/wscript10
-rw-r--r--src/wscript4
-rw-r--r--wscript4
61 files changed, 15 insertions, 15 deletions
diff --git a/.clang-tidy b/.clang-tidy
index da5849c8..3f605635 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -55,5 +55,5 @@ Checks: >
-readability-implicit-bool-conversion,
-readability-named-parameter,
WarningsAsErrors: '*'
-HeaderFilterRegex: 'ingen/.*|tests/.*|src/.*'
+HeaderFilterRegex: 'include/ingen/.*|tests/.*|src/.*'
FormatStyle: file
diff --git a/ingen/Arc.hpp b/include/ingen/Arc.hpp
index 62c95d67..62c95d67 100644
--- a/ingen/Arc.hpp
+++ b/include/ingen/Arc.hpp
diff --git a/ingen/Atom.hpp b/include/ingen/Atom.hpp
index 3fb8f091..3fb8f091 100644
--- a/ingen/Atom.hpp
+++ b/include/ingen/Atom.hpp
diff --git a/ingen/AtomForge.hpp b/include/ingen/AtomForge.hpp
index b1cec69d..b1cec69d 100644
--- a/ingen/AtomForge.hpp
+++ b/include/ingen/AtomForge.hpp
diff --git a/ingen/AtomReader.hpp b/include/ingen/AtomReader.hpp
index 75a3c690..75a3c690 100644
--- a/ingen/AtomReader.hpp
+++ b/include/ingen/AtomReader.hpp
diff --git a/ingen/AtomSink.hpp b/include/ingen/AtomSink.hpp
index 395eba54..395eba54 100644
--- a/ingen/AtomSink.hpp
+++ b/include/ingen/AtomSink.hpp
diff --git a/ingen/AtomWriter.hpp b/include/ingen/AtomWriter.hpp
index f9052d93..f9052d93 100644
--- a/ingen/AtomWriter.hpp
+++ b/include/ingen/AtomWriter.hpp
diff --git a/ingen/ClashAvoider.hpp b/include/ingen/ClashAvoider.hpp
index 1d2cebf0..1d2cebf0 100644
--- a/ingen/ClashAvoider.hpp
+++ b/include/ingen/ClashAvoider.hpp
diff --git a/ingen/Clock.hpp b/include/ingen/Clock.hpp
index 27d8443d..27d8443d 100644
--- a/ingen/Clock.hpp
+++ b/include/ingen/Clock.hpp
diff --git a/ingen/ColorContext.hpp b/include/ingen/ColorContext.hpp
index aadb2980..aadb2980 100644
--- a/ingen/ColorContext.hpp
+++ b/include/ingen/ColorContext.hpp
diff --git a/ingen/Configuration.hpp b/include/ingen/Configuration.hpp
index 4b290316..4b290316 100644
--- a/ingen/Configuration.hpp
+++ b/include/ingen/Configuration.hpp
diff --git a/ingen/DataAccess.hpp b/include/ingen/DataAccess.hpp
index 13b5ac47..13b5ac47 100644
--- a/ingen/DataAccess.hpp
+++ b/include/ingen/DataAccess.hpp
diff --git a/ingen/EngineBase.hpp b/include/ingen/EngineBase.hpp
index 36742601..36742601 100644
--- a/ingen/EngineBase.hpp
+++ b/include/ingen/EngineBase.hpp
diff --git a/ingen/FilePath.hpp b/include/ingen/FilePath.hpp
index 337553ef..337553ef 100644
--- a/ingen/FilePath.hpp
+++ b/include/ingen/FilePath.hpp
diff --git a/ingen/Forge.hpp b/include/ingen/Forge.hpp
index 10b4e622..10b4e622 100644
--- a/ingen/Forge.hpp
+++ b/include/ingen/Forge.hpp
diff --git a/ingen/InstanceAccess.hpp b/include/ingen/InstanceAccess.hpp
index 5d068ae1..5d068ae1 100644
--- a/ingen/InstanceAccess.hpp
+++ b/include/ingen/InstanceAccess.hpp
diff --git a/ingen/Interface.hpp b/include/ingen/Interface.hpp
index 6ce12c6a..6ce12c6a 100644
--- a/ingen/Interface.hpp
+++ b/include/ingen/Interface.hpp
diff --git a/ingen/LV2Features.hpp b/include/ingen/LV2Features.hpp
index 75d5b377..75d5b377 100644
--- a/ingen/LV2Features.hpp
+++ b/include/ingen/LV2Features.hpp
diff --git a/ingen/Library.hpp b/include/ingen/Library.hpp
index fd4f4260..fd4f4260 100644
--- a/ingen/Library.hpp
+++ b/include/ingen/Library.hpp
diff --git a/ingen/Log.hpp b/include/ingen/Log.hpp
index d668e873..d668e873 100644
--- a/ingen/Log.hpp
+++ b/include/ingen/Log.hpp
diff --git a/ingen/Message.hpp b/include/ingen/Message.hpp
index 09444d4a..09444d4a 100644
--- a/ingen/Message.hpp
+++ b/include/ingen/Message.hpp
diff --git a/ingen/Module.hpp b/include/ingen/Module.hpp
index 88f4afcd..88f4afcd 100644
--- a/ingen/Module.hpp
+++ b/include/ingen/Module.hpp
diff --git a/ingen/Node.hpp b/include/ingen/Node.hpp
index 148a9103..148a9103 100644
--- a/ingen/Node.hpp
+++ b/include/ingen/Node.hpp
diff --git a/ingen/Parser.hpp b/include/ingen/Parser.hpp
index 45d087cd..45d087cd 100644
--- a/ingen/Parser.hpp
+++ b/include/ingen/Parser.hpp
diff --git a/ingen/Properties.hpp b/include/ingen/Properties.hpp
index cd81ba59..cd81ba59 100644
--- a/ingen/Properties.hpp
+++ b/include/ingen/Properties.hpp
diff --git a/ingen/QueuedInterface.hpp b/include/ingen/QueuedInterface.hpp
index f45dd3da..f45dd3da 100644
--- a/ingen/QueuedInterface.hpp
+++ b/include/ingen/QueuedInterface.hpp
diff --git a/ingen/Resource.hpp b/include/ingen/Resource.hpp
index 481e4c30..481e4c30 100644
--- a/ingen/Resource.hpp
+++ b/include/ingen/Resource.hpp
diff --git a/ingen/Serialiser.hpp b/include/ingen/Serialiser.hpp
index 1ac5c151..1ac5c151 100644
--- a/ingen/Serialiser.hpp
+++ b/include/ingen/Serialiser.hpp
diff --git a/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp
index 22a0f4aa..22a0f4aa 100644
--- a/ingen/SocketReader.hpp
+++ b/include/ingen/SocketReader.hpp
diff --git a/ingen/SocketWriter.hpp b/include/ingen/SocketWriter.hpp
index 229f7b50..229f7b50 100644
--- a/ingen/SocketWriter.hpp
+++ b/include/ingen/SocketWriter.hpp
diff --git a/ingen/Status.hpp b/include/ingen/Status.hpp
index c4ffd4c9..c4ffd4c9 100644
--- a/ingen/Status.hpp
+++ b/include/ingen/Status.hpp
diff --git a/ingen/Store.hpp b/include/ingen/Store.hpp
index 1aa90936..1aa90936 100644
--- a/ingen/Store.hpp
+++ b/include/ingen/Store.hpp
diff --git a/ingen/StreamWriter.hpp b/include/ingen/StreamWriter.hpp
index 620497f8..620497f8 100644
--- a/ingen/StreamWriter.hpp
+++ b/include/ingen/StreamWriter.hpp
diff --git a/ingen/Tee.hpp b/include/ingen/Tee.hpp
index b13b9e95..b13b9e95 100644
--- a/ingen/Tee.hpp
+++ b/include/ingen/Tee.hpp
diff --git a/ingen/TurtleWriter.hpp b/include/ingen/TurtleWriter.hpp
index 9c88be2e..9c88be2e 100644
--- a/ingen/TurtleWriter.hpp
+++ b/include/ingen/TurtleWriter.hpp
diff --git a/ingen/URI.hpp b/include/ingen/URI.hpp
index 78577d90..78577d90 100644
--- a/ingen/URI.hpp
+++ b/include/ingen/URI.hpp
diff --git a/ingen/URIMap.hpp b/include/ingen/URIMap.hpp
index 7efef8d1..7efef8d1 100644
--- a/ingen/URIMap.hpp
+++ b/include/ingen/URIMap.hpp
diff --git a/ingen/URIs.hpp b/include/ingen/URIs.hpp
index 9d4b2818..9d4b2818 100644
--- a/ingen/URIs.hpp
+++ b/include/ingen/URIs.hpp
diff --git a/ingen/World.hpp b/include/ingen/World.hpp
index e06c0a18..e06c0a18 100644
--- a/ingen/World.hpp
+++ b/include/ingen/World.hpp
diff --git a/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp
index e42dd7bd..e42dd7bd 100644
--- a/ingen/client/ArcModel.hpp
+++ b/include/ingen/client/ArcModel.hpp
diff --git a/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index d003b7d1..d003b7d1 100644
--- a/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
diff --git a/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index 54eaf373..54eaf373 100644
--- a/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
diff --git a/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp
index 2248e7e3..2248e7e3 100644
--- a/ingen/client/GraphModel.hpp
+++ b/include/ingen/client/GraphModel.hpp
diff --git a/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 39729377..39729377 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
diff --git a/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index dbefaf95..dbefaf95 100644
--- a/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
diff --git a/ingen/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp
index 70ff7274..70ff7274 100644
--- a/ingen/client/PluginUI.hpp
+++ b/include/ingen/client/PluginUI.hpp
diff --git a/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index c386dff0..c386dff0 100644
--- a/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
diff --git a/ingen/client/SigClientInterface.hpp b/include/ingen/client/SigClientInterface.hpp
index 674714a3..674714a3 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/include/ingen/client/SigClientInterface.hpp
diff --git a/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp
index 8e551821..8e551821 100644
--- a/ingen/client/SocketClient.hpp
+++ b/include/ingen/client/SocketClient.hpp
diff --git a/ingen/client/signal.hpp b/include/ingen/client/signal.hpp
index ba5b017b..ba5b017b 100644
--- a/ingen/client/signal.hpp
+++ b/include/ingen/client/signal.hpp
diff --git a/ingen/filesystem.hpp b/include/ingen/filesystem.hpp
index 44b9148e..44b9148e 100644
--- a/ingen/filesystem.hpp
+++ b/include/ingen/filesystem.hpp
diff --git a/ingen/fmt.hpp b/include/ingen/fmt.hpp
index 3c792d3d..3c792d3d 100644
--- a/ingen/fmt.hpp
+++ b/include/ingen/fmt.hpp
diff --git a/ingen/ingen.h b/include/ingen/ingen.h
index 05b9e7b2..05b9e7b2 100644
--- a/ingen/ingen.h
+++ b/include/ingen/ingen.h
diff --git a/ingen/paths.hpp b/include/ingen/paths.hpp
index 05496114..05496114 100644
--- a/ingen/paths.hpp
+++ b/include/ingen/paths.hpp
diff --git a/ingen/runtime_paths.hpp b/include/ingen/runtime_paths.hpp
index 30e877fb..30e877fb 100644
--- a/ingen/runtime_paths.hpp
+++ b/include/ingen/runtime_paths.hpp
diff --git a/ingen/types.hpp b/include/ingen/types.hpp
index 2962d16a..2962d16a 100644
--- a/ingen/types.hpp
+++ b/include/ingen/types.hpp
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,
diff --git a/wscript b/wscript
index f30b38f4..a3bbb00f 100644
--- a/wscript
+++ b/wscript
@@ -310,7 +310,7 @@ def build(bld):
bld(features = 'c cxx cxxprogram',
source = 'src/ingen/ingen.cpp',
target = 'ingen',
- includes = ['.'],
+ includes = ['include'],
use = 'libingen',
uselib = 'SERD SORD SRATOM RAUL LILV LV2',
install_path = '${BINDIR}')
@@ -321,7 +321,7 @@ def build(bld):
bld(features = 'cxx cxxprogram',
source = 'tests/%s.cpp' % i,
target = 'tests/%s' % i,
- includes = ['.'],
+ includes = ['include'],
use = 'libingen',
uselib = 'SERD SORD SRATOM RAUL LILV LV2',
install_path = '',
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-19 21:35:13 +0000