From a6caee81b80b02d32605ef48b1943add88a6d07e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 6 Oct 2008 14:54:41 +0000
Subject: Specify absolute include paths to fix waf dependency tracking.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1626 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/wscript        | 2 +-
 src/engine/Engine.hpp     | 9 +++++----
 src/engine/wscript        | 2 +-
 src/gui/wscript           | 2 +-
 src/module/wscript        | 2 +-
 src/serialisation/wscript | 2 +-
 src/shared/wscript        | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/client/wscript b/src/client/wscript
index 66358799..b351e3c2 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -28,7 +28,7 @@ def build(bld):
 	if bld.env()['HAVE_LIBLO'] == 1:
 		obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
 
-	obj.includes = ['..', '../common']
+	obj.includes = ['.', '..', '../common']
 	obj.name     = 'libingen_client'
 	obj.target   = 'ingen_client'
 	obj.inst_dir = 'lib/ingen'
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp
index bb194ed3..9c824c9a 100644
--- a/src/engine/Engine.hpp
+++ b/src/engine/Engine.hpp
@@ -55,6 +55,9 @@ class MessageContext;
  * This is a (GoF) facade for the engine.  Pointers to all components are
  * available for more advanced control than this facade allows.
  *
+ * Most objects in the engine have (directly or indirectly) a pointer to the
+ * Engine they are a part of.
+ *
  * \ingroup engine
  */
 class Engine : boost::noncopyable
@@ -106,10 +109,8 @@ public:
 	inline ProcessSlaves& process_slaves() { return _process_slaves; }
 	
 private:
-	ProcessSlaves         _process_slaves;
-
-	Ingen::Shared::World* _world;
-
+	ProcessSlaves          _process_slaves;
+	Ingen::Shared::World*  _world;
 	SharedPtr<EventSource> _event_source;
 	SharedPtr<AudioDriver> _audio_driver;
 	MidiDriver*            _midi_driver;
diff --git a/src/engine/wscript b/src/engine/wscript
index 0b2b3812..1f2ec1f3 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -79,7 +79,7 @@ def build(bld):
 		obj.source += ' HTTPEngineReceiver.cpp '
 	if bld.env()['HAVE_LIBLO']:
 		obj.source += ' OSCEngineReceiver.cpp OSCClientSender.cpp '
-	obj.includes     = ['..', '../common', './events']
+	obj.includes     = ['.', '..', '../common', './events']
 	obj.name         = 'libingen_engine'
 	obj.target       = 'ingen_engine'
 	obj.inst_dir     = 'lib/ingen'
diff --git a/src/gui/wscript b/src/gui/wscript
index 60136171..860a21a0 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -42,7 +42,7 @@ def build(bld):
 	if bld.env()['HAVE_CURL'] != 0:
 		obj.source += 'UploadPatchWindow.cpp'
 
-	obj.includes       = ['..', '../common']
+	obj.includes       = ['.', '..', '../common']
 	obj.defines        = 'INGEN_DATA_DIR=\\\"' + Params.g_options.datadir + '\\\"'
 	obj.name           = 'libingen_gui'
 	obj.target         = 'ingen_gui'
diff --git a/src/module/wscript b/src/module/wscript
index 70a49bd7..a3b593d9 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -8,7 +8,7 @@ def build(bld):
 		Module.cpp
 		global.cpp
 	'''
-	obj.includes = ['..', '../common']
+	obj.includes = ['.', '..', '../common']
 	obj.defines  = 'INGEN_MODULE_DIR=\\\"' + bld.env()['PREFIX'] + 'lib/ingen\\\"'
 	obj.name     = 'libingen_module'
 	obj.target   = 'ingen_module'
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 3eeccf25..8fa5aeb9 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -9,7 +9,7 @@ def build(bld):
 		Serialiser.cpp
 		serialisation.cpp
 	'''
-	obj.includes = ['..', '../common']
+	obj.includes = ['.', '..', '../common']
 	obj.name     = 'libingen_serialisation'
 	obj.target   = 'ingen_serialisation'
 	obj.inst_dir = 'lib/ingen'
diff --git a/src/shared/wscript b/src/shared/wscript
index 741c9379..9820c150 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -13,7 +13,7 @@ def build(bld):
 	'''
 	if bld.env()['HAVE_LIBLO']:
 		obj.source += ' OSCSender.cpp '
-	obj.includes = ['../', '../common']
+	obj.includes = ['.', '../', '../common']
 	obj.name     = 'libingen_shared'
 	obj.target   = 'ingen_shared'
 	obj.vnum     = '0.0.0'
-- 
cgit v1.2.1