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

9 files changed, 20 insertions, 20 deletions

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',