2 files changed, 1 insertions, 17 deletions
diff --git a/waf b/waf
index 2fa6b8f7..c443af85 100755
--- a/waf
+++ b/waf
diff --git a/wscript b/wscript
index f38a1276..2078e1b4 100644
--- a/wscript
+++ b/wscript
@@ -90,13 +90,9 @@ def configure(conf):
                mandatory     = False)
 
     autowaf.define(conf, 'SERD_VERSION', SERD_VERSION)
+    autowaf.set_lib_env(conf, 'serd', SERD_VERSION)
     conf.write_config_header('serd_config.h', remove=False)
 
-    # Set up env for building against local serd in case we are a child 
-    conf.env.INCLUDES_SERD = ['${INCLUDEDIR}/serd-%s' % SERD_MAJOR_VERSION]
-    conf.env.LIBPATH_SERD  = [conf.env.LIBDIR]
-    conf.env.LIB_SERD      = ['serd-%s' % SERD_MAJOR_VERSION];
-
     autowaf.display_msg(conf, 'Utilities', str(conf.env.BUILD_UTILS))
     autowaf.display_msg(conf, 'Unit tests', str(conf.env.BUILD_TESTS))
     print('')
@@ -110,18 +106,6 @@ lib_source = [
     'src/writer.c',
 ]
 
-import sys
-from waflib.TaskGen import feature, before
-@feature('c')
-@before('apply_link')
-def version_lib(self):
-    if sys.platform == 'win32':
-        self.vnum = None
-        if self.env['DEBUG']:
-            applicable = ['cshlib', 'cxxshlib', 'cstlib', 'cxxstlib']
-            if [x for x in applicable if x in self.features]:
-                self.target = self.target + 'D'
-
 def build(bld):
     # C Headers
     includedir = '${INCLUDEDIR}/serd-%s/serd' % SERD_MAJOR_VERSION