Fix (most) include dependencies and resulting broken build problems.

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

7 files changed, 12 insertions, 2 deletions

diff --git a/src/client/wscript b/src/client/wscript
index 76666d94..9bb1f4e3 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -28,6 +28,7 @@ def build(bld):
 		obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
 
 	obj.includes     = ['.', '..', '../common']
+	obj.export_incdirs = ['.']
 	obj.name         = 'libingen_client'
 	obj.target       = 'ingen_client'
 	obj.install_path = '${LIBDIR}/ingen'
diff --git a/src/engine/wscript b/src/engine/wscript
index 1ab68cc7..d225bf86 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -42,6 +42,7 @@ def build(bld):
 		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
 	if bld.env['HAVE_SLV2'] == 1:
 		obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../common', './events']
 	obj.name         = 'libingen_engine'
 	obj.target       = 'ingen_engine'
@@ -82,6 +83,7 @@ def build(bld):
 		events/SetPolyphonyEvent.cpp
 		events/UnregisterClientEvent.cpp
 	'''
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../common', './events', '../engine']
 	obj.name         = 'libingen_engine_queued'
 	obj.target       = 'ingen_engine_queued'
@@ -110,6 +112,7 @@ def build(bld):
 			OSCClientSender.cpp
 			OSCEngineReceiver.cpp
 		'''
+		obj.export_incdirs = ['.']
 		obj.includes     = ['.', '..', '../common', './events', '../engine']
 		obj.name         = 'libingen_engine_osc'
 		obj.target       = 'ingen_engine_osc'
@@ -119,6 +122,7 @@ def build(bld):
 	if bld.env['HAVE_JACK'] == 1:
 		obj = bld.new_task_gen('cxx', 'shlib')
 		obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp'
+		obj.export_incdirs = ['.']
 		obj.includes     = ['.', '..', '../common', './events', '../engine']
 		obj.name         = 'libingen_engine_jack'
 		obj.target       = 'ingen_engine_jack'
@@ -132,6 +136,7 @@ def build(bld):
 		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
 	if bld.env['HAVE_SLV2'] == 1:
 		obj.source += ' LV2Plugin.cpp LV2Node.cpp '
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../common', './events']
 	obj.name         = 'ingen_lv2'
 	obj.target       = 'ingen.lv2/ingen_lv2'
diff --git a/src/gui/wscript b/src/gui/wscript
index 87be97e4..9d26227c 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -41,11 +41,12 @@ def build(bld):
 	if bld.env['HAVE_CURL'] != 0:
 		obj.source += 'UploadPatchWindow.cpp'
 
+	obj.export_incdirs = ['.']
 	obj.includes       = ['.', '..', '../common', '../client', '../module']
 	obj.name           = 'libingen_gui'
 	obj.target         = 'ingen_gui'
 	obj.install_path   = '${LIBDIR}/ingen'
-	obj.uselib_local   = 'libingen_shared'
+	obj.uselib_local   = 'libingen_shared libingen_client libingen_module'
 	autowaf.use_lib(bld, obj, '''
 		CURL
 		FLOWCANVAS
diff --git a/src/ingen/cmdline.c b/src/ingen/cmdline.c
index c9e65f5f..bb41cb23 100644
--- a/src/ingen/cmdline.c
+++ b/src/ingen/cmdline.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "getopt.h"
+#include <getopt.h>
 
 #include "cmdline.h"
 
diff --git a/src/module/wscript b/src/module/wscript
index c8a250c9..ee25130d 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -7,6 +7,7 @@ def build(bld):
 		Module.cpp
 		global.cpp
 	'''
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../common']
 	obj.name         = 'libingen_module'
 	obj.target       = 'ingen_module'
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index b72b6507..04923074 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -8,6 +8,7 @@ def build(bld):
 		Serialiser.cpp
 		serialisation.cpp
 	'''
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../common']
 	obj.name         = 'libingen_serialisation'
 	obj.target       = 'ingen_serialisation'
diff --git a/src/shared/wscript b/src/shared/wscript
index eae1eee0..1250c040 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -16,6 +16,7 @@ def build(bld):
 	if bld.env['HAVE_SOUP'] == 1:
 		autowaf.use_lib(bld, obj, 'SOUP')
 		obj.source += ' HTTPSender.cpp '
+	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '../', '../common']
 	obj.name         = 'libingen_shared'
 	obj.target       = 'ingen_shared'