Remove weird "include" directory and use standard style ("ingen" directory in top level).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4063 a436a847-0d15-0410-975c-d299462d15a1

48 files changed, 24 insertions, 24 deletions

diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in
index 935b93f7..c710719e 100644
--- a/doc/reference.doxygen.in
+++ b/doc/reference.doxygen.in
@@ -568,7 +568,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @INGEN_SRCDIR@/include \
+INPUT                  = @INGEN_SRCDIR@ \
                          @INGEN_SRCDIR@/src/engine/OSCEngineReceiver.cpp \
                          @INGEN_SRCDIR@/src/engine/OSCClientSender.cpp
 
diff --git a/include/ingen/ClientInterface.hpp b/ingen/ClientInterface.hpp
index 0bed231c..0bed231c 100644
--- a/include/ingen/ClientInterface.hpp
+++ b/ingen/ClientInterface.hpp
diff --git a/include/ingen/CommonInterface.hpp b/ingen/CommonInterface.hpp
index 398fbd3b..398fbd3b 100644
--- a/include/ingen/CommonInterface.hpp
+++ b/ingen/CommonInterface.hpp
diff --git a/include/ingen/Connection.hpp b/ingen/Connection.hpp
index f300adb8..f300adb8 100644
--- a/include/ingen/Connection.hpp
+++ b/ingen/Connection.hpp
diff --git a/include/ingen/EngineBase.hpp b/ingen/EngineBase.hpp
index 80d1c789..80d1c789 100644
--- a/include/ingen/EngineBase.hpp
+++ b/ingen/EngineBase.hpp
diff --git a/include/ingen/GraphObject.hpp b/ingen/GraphObject.hpp
index 393569e0..393569e0 100644
--- a/include/ingen/GraphObject.hpp
+++ b/ingen/GraphObject.hpp
diff --git a/include/ingen/Node.hpp b/ingen/Node.hpp
index 70864766..70864766 100644
--- a/include/ingen/Node.hpp
+++ b/ingen/Node.hpp
diff --git a/include/ingen/Patch.hpp b/ingen/Patch.hpp
index 83c80db4..83c80db4 100644
--- a/include/ingen/Patch.hpp
+++ b/ingen/Patch.hpp
diff --git a/include/ingen/Plugin.hpp b/ingen/Plugin.hpp
index 9b6d87b5..9b6d87b5 100644
--- a/include/ingen/Plugin.hpp
+++ b/ingen/Plugin.hpp
diff --git a/include/ingen/Port.hpp b/ingen/Port.hpp
index c703c6d8..c703c6d8 100644
--- a/include/ingen/Port.hpp
+++ b/ingen/Port.hpp
diff --git a/include/ingen/Resource.hpp b/ingen/Resource.hpp
index 56b5157a..56b5157a 100644
--- a/include/ingen/Resource.hpp
+++ b/ingen/Resource.hpp
diff --git a/include/ingen/ServerInterface.hpp b/ingen/ServerInterface.hpp
index 25016416..25016416 100644
--- a/include/ingen/ServerInterface.hpp
+++ b/ingen/ServerInterface.hpp
diff --git a/include/ingen/Status.hpp b/ingen/Status.hpp
index 0e19435a..0e19435a 100644
--- a/include/ingen/Status.hpp
+++ b/ingen/Status.hpp
diff --git a/include/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index b6042086..b6042086 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
diff --git a/include/ingen/client/ConnectionModel.hpp b/ingen/client/ConnectionModel.hpp
index 1c719914..1c719914 100644
--- a/include/ingen/client/ConnectionModel.hpp
+++ b/ingen/client/ConnectionModel.hpp
diff --git a/include/ingen/client/NodeModel.hpp b/ingen/client/NodeModel.hpp
index ef04be90..ef04be90 100644
--- a/include/ingen/client/NodeModel.hpp
+++ b/ingen/client/NodeModel.hpp
diff --git a/include/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index b426ebdc..b426ebdc 100644
--- a/include/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
diff --git a/include/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp
index 023a1dc2..023a1dc2 100644
--- a/include/ingen/client/PatchModel.hpp
+++ b/ingen/client/PatchModel.hpp
diff --git a/include/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index a0887454..a0887454 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
diff --git a/include/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index 501db260..501db260 100644
--- a/include/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
diff --git a/include/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 35e3c4ea..35e3c4ea 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
diff --git a/include/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 559d1b15..559d1b15 100644
--- a/include/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
diff --git a/include/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 6ded560e..6ded560e 100644
--- a/include/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
diff --git a/include/ingen/client/signal.hpp b/ingen/client/signal.hpp
index f40c6a57..f40c6a57 100644
--- a/include/ingen/client/signal.hpp
+++ b/ingen/client/signal.hpp
diff --git a/include/ingen/serialisation/Parser.hpp b/ingen/serialisation/Parser.hpp
index 492af2ad..492af2ad 100644
--- a/include/ingen/serialisation/Parser.hpp
+++ b/ingen/serialisation/Parser.hpp
diff --git a/include/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp
index 8d5805e1..8d5805e1 100644
--- a/include/ingen/serialisation/Serialiser.hpp
+++ b/ingen/serialisation/Serialiser.hpp
diff --git a/include/ingen/shared/Builder.hpp b/ingen/shared/Builder.hpp
index 245b3013..245b3013 100644
--- a/include/ingen/shared/Builder.hpp
+++ b/ingen/shared/Builder.hpp
diff --git a/include/ingen/shared/ClashAvoider.hpp b/ingen/shared/ClashAvoider.hpp
index 4f5d8ec1..4f5d8ec1 100644
--- a/include/ingen/shared/ClashAvoider.hpp
+++ b/ingen/shared/ClashAvoider.hpp
diff --git a/include/ingen/shared/Configuration.hpp b/ingen/shared/Configuration.hpp
index 21bc5737..21bc5737 100644
--- a/include/ingen/shared/Configuration.hpp
+++ b/ingen/shared/Configuration.hpp
diff --git a/include/ingen/shared/LV2Atom.hpp b/ingen/shared/LV2Atom.hpp
index 0aa35889..0aa35889 100644
--- a/include/ingen/shared/LV2Atom.hpp
+++ b/ingen/shared/LV2Atom.hpp
diff --git a/include/ingen/shared/LV2Features.hpp b/ingen/shared/LV2Features.hpp
index f33cc605..f33cc605 100644
--- a/include/ingen/shared/LV2Features.hpp
+++ b/ingen/shared/LV2Features.hpp
diff --git a/include/ingen/shared/LV2URIMap.hpp b/ingen/shared/LV2URIMap.hpp
index 70c47a12..70c47a12 100644
--- a/include/ingen/shared/LV2URIMap.hpp
+++ b/ingen/shared/LV2URIMap.hpp
diff --git a/include/ingen/shared/Module.hpp b/ingen/shared/Module.hpp
index f972a999..f972a999 100644
--- a/include/ingen/shared/Module.hpp
+++ b/ingen/shared/Module.hpp
diff --git a/include/ingen/shared/ResourceImpl.hpp b/ingen/shared/ResourceImpl.hpp
index 8069c480..8069c480 100644
--- a/include/ingen/shared/ResourceImpl.hpp
+++ b/ingen/shared/ResourceImpl.hpp
diff --git a/include/ingen/shared/Store.hpp b/ingen/shared/Store.hpp
index 3347cdde..3347cdde 100644
--- a/include/ingen/shared/Store.hpp
+++ b/ingen/shared/Store.hpp
diff --git a/include/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index b3d8d301..b3d8d301 100644
--- a/include/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
diff --git a/include/ingen/shared/World.hpp b/ingen/shared/World.hpp
index e062dea6..e062dea6 100644
--- a/include/ingen/shared/World.hpp
+++ b/ingen/shared/World.hpp
diff --git a/include/ingen/shared/runtime_paths.hpp b/ingen/shared/runtime_paths.hpp
index 3ed48f00..3ed48f00 100644
--- a/include/ingen/shared/runtime_paths.hpp
+++ b/ingen/shared/runtime_paths.hpp
diff --git a/src/bindings/build.sh b/src/bindings/build.sh
index 5723df35..a1f17e8a 100755
--- a/src/bindings/build.sh
+++ b/src/bindings/build.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 swig -c++ -python ./ingen.i
 
-gcc -shared -o _ingen.so ./ingen_wrap.cxx ./ingen_bindings.cpp -I.. -I../../include `pkg-config --cflags --libs glibmm-2.4` `python-config --cflags --ldflags` -fPIC
+gcc -shared -o _ingen.so ./ingen_wrap.cxx ./ingen_bindings.cpp -I.. -I../.. `pkg-config --cflags --libs glibmm-2.4` `python-config --cflags --ldflags` -fPIC
diff --git a/src/bindings/ingen.i b/src/bindings/ingen.i
index 7eb99d57..6b39eb33 100644
--- a/src/bindings/ingen.i
+++ b/src/bindings/ingen.i
@@ -11,9 +11,9 @@
 
 /*%ignore Ingen::Shared::EngineInterface;*/
 
-%include "../../include/ingen/CommonInterface.hpp"
-%include "../../include/ingen/ClientInterface.hpp"
-%include "../../include/ingen/EngineInterface.hpp"
+%include "../../ingen/CommonInterface.hpp"
+%include "../../ingen/ClientInterface.hpp"
+%include "../../ingen/EngineInterface.hpp"
 %include "../../includemodule/World.hpp"
 //%include "../module/module.h"
 %include "ingen_bindings.hpp"
diff --git a/src/client/wscript b/src/client/wscript
index 29ac636d..526c049f 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -3,8 +3,8 @@ from waflib.extras import autowaf as autowaf
 
 def build(bld):
     obj = bld(features        = 'cxx cxxshlib',
-              includes        = ['../..', '../../include'],
-              export_includes = ['../../include'],
+              includes        = ['../..'],
+              export_includes = ['../..'],
               name            = 'libingen_client',
               target          = 'ingen_client',
               install_path    = '${LIBDIR}',
diff --git a/src/gui/wscript b/src/gui/wscript
index 720b100f..ec6e451a 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -4,8 +4,8 @@ import waflib.Utils as Utils
 
 def build(bld):
     obj = bld(features        = 'cxx cxxshlib',
-              export_includes = ['../../include'],
-              includes        = ['../..', '../../include'],
+              export_includes = ['../..'],
+              includes        = ['../..'],
               name            = 'libingen_gui',
               target          = 'ingen_gui',
               install_path    = '${LIBDIR}',
diff --git a/src/http/wscript b/src/http/wscript
index 9d2d6049..dec805e3 100644
--- a/src/http/wscript
+++ b/src/http/wscript
@@ -8,7 +8,7 @@ def build(bld):
                                        HTTPEngineReceiver.cpp
                                        HTTPSender.cpp
                                        ingen_http_server.cpp''',
-                  includes        = ['../..', '../../include'],
+                  includes        = ['../..'],
                   name            = 'libingen_http_server',
                   target          = 'ingen_http_server',
                   install_path    = '${LIBDIR}',
@@ -20,7 +20,7 @@ def build(bld):
                                        HTTPEngineSender.cpp
                                        HTTPSender.cpp
                                        ingen_http_client.cpp''',
-                  includes        = ['../..', '../../include'],
+                  includes        = ['../..'],
                   name            = 'libingen_http_client',
                   target          = 'ingen_http_client',
                   install_path    = '${LIBDIR}',
diff --git a/src/osc/wscript b/src/osc/wscript
index 01e86db9..ae0d6245 100644
--- a/src/osc/wscript
+++ b/src/osc/wscript
@@ -8,7 +8,7 @@ def build(bld):
                                        OSCEngineReceiver.cpp
                                        OSCSender.cpp
                                        ingen_osc_server.cpp''',
-                  includes        = ['.', '../..', '../../include'],
+                  includes        = ['.', '../..'],
                   name            = 'libingen_osc_server',
                   target          = 'ingen_osc_server',
                   install_path    = '${LIBDIR}',
@@ -20,7 +20,7 @@ def build(bld):
                                        OSCEngineSender.cpp
                                        OSCSender.cpp
                                        ingen_osc_client.cpp''',
-                  includes        = ['.', '../..', '../../include'],
+                  includes        = ['.', '../..'],
                   name            = 'libingen_osc_client',
                   target          = 'ingen_osc_client',
                   install_path    = '${LIBDIR}',
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 9914327f..abc1dd46 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -4,8 +4,8 @@ from waflib.extras import autowaf as autowaf
 def build(bld):
     obj = bld(features        = 'cxx cxxshlib',
               source          = 'Parser.cpp Serialiser.cpp serialisation.cpp',
-              export_includes = ['../../include'],
-              includes        = ['../../include'],
+              export_includes = ['../..'],
+              includes        = ['../..'],
               name            = 'libingen_serialisation',
               target          = 'ingen_serialisation',
               install_path    = '${LIBDIR}',
diff --git a/src/server/wscript b/src/server/wscript
index c9fae6e5..593664be 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -56,8 +56,8 @@ def build(bld):
 
     obj = bld(features        = 'cxx cxxshlib',
               source          = core_source,
-              export_includes = ['../../include'],
-              includes        = ['.', '../..', '../../include'],
+              export_includes = ['../..'],
+              includes        = ['.', '../..'],
               name            = 'libingen_server',
               target          = 'ingen_server',
               install_path    = '${LIBDIR}',
@@ -68,7 +68,7 @@ def build(bld):
     if bld.is_defined('HAVE_JACK'):
         obj = bld(features        = 'cxx cxxshlib',
                   source          = 'JackDriver.cpp ingen_jack.cpp',
-                  includes        = ['.', '../..', '../../include'],
+                  includes        = ['.', '../..'],
                   name            = 'libingen_jack',
                   target          = 'ingen_jack',
                   install_path    = '${LIBDIR}',
@@ -78,7 +78,7 @@ def build(bld):
     # Ingen LV2 wrapper
     obj = bld(features     = 'cxx cxxshlib',
               source       = ' ingen_lv2.cpp ',
-              includes     = ['.', '../..', '../../include'],
+              includes     = ['.', '../..'],
               name         = 'libingen_lv2',
               target       = 'ingen_lv2',
               install_path = '${LV2DIR}/ingen.lv2/',
diff --git a/src/shared/wscript b/src/shared/wscript
index b1cb6d17..72f56012 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -3,8 +3,8 @@ from waflib.extras import autowaf as autowaf
 
 def build(bld):
     obj = bld(features        = 'cxx cxxshlib',
-              export_includes = ['../../include'],
-              includes        = ['../..', '../../include'],
+              export_includes = ['../..'],
+              includes        = ['../..'],
               name            = 'libingen_shared',
               target          = 'ingen_shared',
               vnum            = '0.0.0',
diff --git a/wscript b/wscript
index 013568e5..9e2083fb 100644
--- a/wscript
+++ b/wscript
@@ -146,7 +146,7 @@ def build(bld):
     # Headers
     for i in ['', 'client', 'serialisation', 'shared']:
         bld.install_files('${INCLUDEDIR}/ingen/%s' % i,
-                          bld.path.ant_glob('include/ingen/%s/*' % i))
+                          bld.path.ant_glob('ingen/%s/*' % i))
 
     # Modules
     bld.recurse('src/shared')
@@ -161,9 +161,9 @@ def build(bld):
 
     # Program
     obj = bld(features     = 'c cxx cxxprogram',
-              target       = 'ingen',
               source       = 'src/ingen/main.cpp',
-              includes     = ['.', '../../include'],
+              target       = bld.path.get_bld().make_node('ingen'),
+              includes     = ['.', '../..'],
               defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"',
               use          = 'libingen_shared',
               install_path = '${BINDIR}')