summaryrefslogtreecommitdiffstats
path: root/src/serialisation
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-13 04:59:03 +0000
committerDavid Robillard <d@drobilla.net>2011-04-13 04:59:03 +0000
commit8b2f670248c92776e375bd30c0815a4ff259bb0e (patch)
tree0f130bf4f118209788d2792b06de9f8b0aefebc6 /src/serialisation
parent793bef06e2a98561e266a32ee767410ea44d4c67 (diff)
downloadingen-8b2f670248c92776e375bd30c0815a4ff259bb0e.tar.gz
ingen-8b2f670248c92776e375bd30c0815a4ff259bb0e.tar.bz2
ingen-8b2f670248c92776e375bd30c0815a4ff259bb0e.zip
Consistent local or installed includes for interface headers.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3143 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation')
-rw-r--r--src/serialisation/Parser.cpp2
-rw-r--r--src/serialisation/Parser.hpp5
-rw-r--r--src/serialisation/Serialiser.cpp12
-rw-r--r--src/serialisation/Serialiser.hpp2
-rw-r--r--src/serialisation/serialisation.cpp1
-rw-r--r--src/serialisation/wscript2
6 files changed, 13 insertions, 11 deletions
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 4d561721..0429b116 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -34,7 +34,7 @@
#include "serd/serd.h"
#include "sord/sordmm.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
#include "module/World.hpp"
#include "shared/LV2URIMap.hpp"
diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp
index 948a2e74..7533a442 100644
--- a/src/serialisation/Parser.hpp
+++ b/src/serialisation/Parser.hpp
@@ -25,9 +25,10 @@
#include <boost/optional.hpp>
-#include "interface/GraphObject.hpp"
+#include "raul/Path.hpp"
+
+#include "ingen/GraphObject.hpp"
-namespace Raul { class Path; }
namespace Sord { class World; class Model; class Node; }
namespace Ingen { namespace Shared { class CommonInterface; } }
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index 7da2048c..0c8cc93c 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -42,12 +42,12 @@
#include "sord/sordmm.hpp"
-#include "interface/Connection.hpp"
-#include "interface/EngineInterface.hpp"
-#include "interface/Node.hpp"
-#include "interface/Patch.hpp"
-#include "interface/Plugin.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Connection.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Plugin.hpp"
+#include "ingen/Port.hpp"
#include "module/World.hpp"
#include "shared/LV2URIMap.hpp"
#include "shared/ResourceImpl.hpp"
diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp
index 596cb1c5..01a6109c 100644
--- a/src/serialisation/Serialiser.hpp
+++ b/src/serialisation/Serialiser.hpp
@@ -29,7 +29,7 @@
#include "sord/sordmm.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
#include "shared/Store.hpp"
namespace Ingen {
diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp
index c6141d7d..a8cf75bd 100644
--- a/src/serialisation/serialisation.cpp
+++ b/src/serialisation/serialisation.cpp
@@ -17,6 +17,7 @@
#include "module/Module.hpp"
#include "module/World.hpp"
+
#include "Parser.hpp"
#include "Serialiser.hpp"
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 54ec7228..3c72871d 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -12,7 +12,7 @@ def build(bld):
serialisation.cpp
'''
obj.export_includes = ['.']
- obj.includes = ['.', '..', '../..', '../common']
+ obj.includes = ['.', '..', '../..', '../../include']
obj.name = 'libingen_serialisation'
obj.target = 'ingen_serialisation'
obj.install_path = '${LIBDIR}'