From 4f47cd0f7a225af480a9b0c13dd65884b9e2e601 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 8 Aug 2012 21:09:03 +0000
Subject: Clean up wscript files.

git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/matriseq@4624 a436a847-0d15-0410-975c-d299462d15a1
---
 wscript | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 371f07f..135755c 100644
--- a/wscript
+++ b/wscript
@@ -18,7 +18,7 @@ def configure(conf):
     autowaf.configure(conf)
     autowaf.display_header('Matriseq Configuration')
 
-    if conf.env['MSVC_COMPILER']:
+    if conf.env.MSVC_COMPILER:
         conf.env.append_unique('CFLAGS', ['-TP', '-MD'])
     else:
         conf.env.append_unique('CFLAGS', '-std=c99')
@@ -26,14 +26,14 @@ def configure(conf):
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2')
     autowaf.check_pkg(conf, 'naub-0', atleast_version='0.0.0', uselib_store='NAUB')
 
-    # Set env['pluginlib_PATTERN']
-    pat = conf.env['cshlib_PATTERN']
+    # Set env.pluginlib_PATTERN
+    pat = conf.env.cshlib_PATTERN
     if pat.startswith('lib'):
         pat = pat[3:]
-    conf.env['pluginlib_PATTERN'] = pat
-    conf.env['pluginlib_EXT'] = pat[pat.rfind('.'):]
+    conf.env.pluginlib_PATTERN = pat
+    conf.env.pluginlib_EXT = pat[pat.rfind('.'):]
 
-    autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR'])
+    autowaf.display_msg(conf, "LV2 bundle directory", conf.env.LV2DIR)
     print('')
 
 def build(bld):
@@ -44,7 +44,7 @@ def build(bld):
         source       = 'manifest.ttl.in',
         target       = '%s/%s' % (bundle, 'manifest.ttl'),
         install_path = '${LV2DIR}/%s' % bundle,
-        LIB_EXT      = bld.env['pluginlib_EXT'])
+        LIB_EXT      = bld.env.pluginlib_EXT)
 
     # Copy other data files to build bundle (build/matriseq.lv2)
     for i in ['matriseq.ttl']:
@@ -52,13 +52,13 @@ def build(bld):
             source       = i,
             target       = '%s/%s' % (bundle, i),
             install_path = '${LV2DIR}/%s' % bundle,
-            LIB_EXT      = bld.env['pluginlib_EXT'])
+            LIB_EXT      = bld.env.pluginlib_EXT)
 
     # Create a build environment that builds module-style library names
     # e.g. matriseq.so instead of libmatriseq.so
     # Note for C++ you must set cxxshlib_PATTERN instead
-    penv                   = bld.env.derive()
-    penv['cshlib_PATTERN'] = bld.env['pluginlib_PATTERN']
+    penv                = bld.env.derive()
+    penv.cshlib_PATTERN = bld.env.pluginlib_PATTERN
 
     # Build plugin library
     obj = bld(features     = 'c cshlib',
-- 
cgit v1.2.1