From 5bc02bf31c689fe4a3758c8b484d220d4de33992 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 3 Feb 2011 04:43:37 +0000
Subject: Add SordTupleIndex enumeration for more readable Tuple code. Add
 sord_node_equals. Add sord_read_file_handle and add graph URI parameter to
 sord_read_file. Resolve relative URIs when parsing into a model. Read literal
 datatype or language when parsing into a model. Bettern debug printing. Add
 GOPS index by default. Add export_indluces to library in wscript for building
 against sord locally.

git-svn-id: http://svn.drobilla.net/sord/trunk@15 3d64ff67-21c5-427c-a301-fe4f08042e5a
---
 wscript | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 828176f..89da079 100644
--- a/wscript
+++ b/wscript
@@ -41,7 +41,7 @@ def configure(conf):
 	                  atleast_version='0.1.0', mandatory=False)
 
 	conf.env['BUILD_TESTS'] = Options.options.build_tests
-	conf.env['BUILD_UTILS'] = conf.env['HAVE_SERD'] != 0
+	conf.env['BUILD_UTILS'] = True
 
 	dump = Options.options.dump.split(',')
 	all = 'all' in dump
@@ -69,15 +69,16 @@ def build(bld):
 
 	# Library
 	obj = bld(features = 'c cshlib')
-	obj.source       = 'src/sord.c src/syntax.c'
-	obj.includes     = ['.', './src']
-	obj.name         = 'libsord'
-	obj.target       = 'sord'
-	obj.vnum         = SORD_LIB_VERSION
-	obj.install_path = '${LIBDIR}'
-	obj.cflags       = [ '-fvisibility=hidden', '-DSORD_SHARED', '-DSORD_INTERNAL' ]
-	obj.libs         = [ 'm' ]
-	autowaf.use_lib(bld, obj, 'GLIB')
+	obj.source          = 'src/sord.c src/syntax.c'
+	obj.includes        = ['.', './src']
+	obj.export_includes = ['.']
+	obj.name            = 'libsord'
+	obj.target          = 'sord'
+	obj.vnum            = SORD_LIB_VERSION
+	obj.install_path    = '${LIBDIR}'
+	obj.cflags          = [ '-fvisibility=hidden', '-DSORD_SHARED', '-DSORD_INTERNAL' ]
+	obj.libs            = [ 'm' ]
+	autowaf.use_lib(bld, obj, 'GLIB SERD')
 	
 	if bld.env['BUILD_TESTS']:
 		# Static library (for unit test code coverage)
@@ -89,7 +90,7 @@ def build(bld):
 		obj.install_path = ''
 		obj.cflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
 		obj.libs         = [ 'm' ]
-		autowaf.use_lib(bld, obj, 'GLIB')
+		autowaf.use_lib(bld, obj, 'GLIB SERD')
 
 		# Unit test program
 		obj = bld(features = 'c cprogram')
@@ -100,7 +101,7 @@ def build(bld):
 		obj.target       = 'sord_test'
 		obj.install_path = ''
 		obj.cflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
-		autowaf.use_lib(bld, obj, 'GLIB')
+		autowaf.use_lib(bld, obj, 'GLIB SERD')
 
 		# Unit test programa
 		if bld.env['BUILD_UTILS']:
@@ -112,7 +113,6 @@ def build(bld):
 			obj.target       = 'sordi_static'
 			obj.install_path = ''
 			obj.cflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
-			autowaf.use_lib(bld, obj, 'SERD')
 
 	# Documentation
 	autowaf.build_dox(bld, 'SORD', SORD_VERSION, top, out)
-- 
cgit v1.2.1