From 285b59a7b9aa2c87f9f37f396f3ece66886cdacf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Thu, 3 Sep 2009 00:38:34 +0000
Subject: [PATCH] Make sure wscripts under libs/surfaces/* are configured. 
 This fixes the OSC surface build, as it now links with liblo.

git-svn-id: svn://localhost/ardour2/branches/3.0@5625 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/surfaces/osc/wscript |  5 -----
 libs/surfaces/wscript     | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 4e1e87d7f5..b365638670 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -18,11 +18,6 @@ def set_options(opt):
 def configure(conf):
 	autowaf.configure(conf)
 	autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
-	conf.env.append_value('LINKFLAGS_LO', '-llo')
-	#
-	#	TODO: Again this append_value shouldn't be necessary really
-	#	but for some reason the link flag is not being added otherwise.
-	#
 
 def build(bld):
 	obj = bld.new_task_gen('cxx', 'shlib')
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index f952df6ed5..2ff22bbfb6 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -19,12 +19,31 @@ VERSION = LIBSURFACES_VERSION
 srcdir = '.'
 blddir = 'build'
 
+children = [
+	'control_protocol',
+	'frontier',
+	'generic_midi',
+	'mackie',
+	'osc',
+	'powermate',
+	'tranzport',
+	'wiimote'
+]
+
 def set_options(opt):
 	autowaf.set_options(opt)
 
+def sub_config_and_use(conf, name, has_objects = True):
+	conf.sub_config(name)
+	autowaf.set_local_lib(conf, name, has_objects)
+
 def configure(conf):
+	autowaf.set_recursive()
 	autowaf.configure(conf)
 
+	for i in children:
+		sub_config_and_use(conf, i)
+
 	conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
 	conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
 	conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')