From 50701a1143c836d24d368298ee9068e721c8a066 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 16 Dec 2010 04:04:45 +0000
Subject: Updates for waf 1.6. Note: this revision breaks documentation
 installation.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2719 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/wscript | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/wscript b/src/gui/wscript
index fb9be2f8..9cccf0bc 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,9 +3,9 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/gui', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/gui', bld.path.ant_glob('*.hpp')
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		App.cpp
 		BreadCrumbs.cpp
@@ -44,12 +44,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}'
-	obj.uselib_local   = 'libingen_shared libingen_module libingen_client libingen_serialisation'
+	obj.export_includes = ['.']
+	obj.includes        = ['.', '..', '../..', '../common', '../client', '../module']
+	obj.name            = 'libingen_gui'
+	obj.target          = 'ingen_gui'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared libingen_module libingen_client libingen_serialisation'
 	autowaf.use_lib(bld, obj, '''
 		CURL
 		FLOWCANVAS
-- 
cgit v1.2.1