From ab605d3603d309e40995c9e22531f48facddf9c3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 15 Mar 2011 22:46:13 +0000 Subject: Remove INSTALL and waf (broken intermediary commit). Update wscript for new waf with included autowaf. git-svn-id: http://svn.drobilla.net/serd/trunk@121 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- INSTALL | 1 - waf | 1 - wscript | 8 ++++---- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 120000 INSTALL delete mode 120000 waf diff --git a/INSTALL b/INSTALL deleted file mode 120000 index 4d35fcc7..00000000 --- a/INSTALL +++ /dev/null @@ -1 +0,0 @@ -autowaf/INSTALL \ No newline at end of file diff --git a/waf b/waf deleted file mode 120000 index cf2d4942..00000000 --- a/waf +++ /dev/null @@ -1 +0,0 @@ -autowaf/waf \ No newline at end of file diff --git a/wscript b/wscript index d3e48382..50d3e18e 100644 --- a/wscript +++ b/wscript @@ -1,13 +1,13 @@ #!/usr/bin/env python -import Logs -import Options -import autowaf import filecmp import glob import os import shutil import subprocess +import waflib.Logs as Logs, waflib.Options as Options +from waflib.extras import autowaf as autowaf + # Version of this package (even if built as a child) SERD_VERSION = '0.1.0' @@ -40,7 +40,7 @@ def configure(conf): autowaf.configure(conf) autowaf.display_header('Serd Configuration') - conf.check_tool('compiler_cc') + conf.load('compiler_cc') conf.env.append_value('CFLAGS', '-std=c99') conf.env['BUILD_TESTS'] = Options.options.build_tests -- cgit v1.2.1