Fix whitespace.

Use new waf build syntax.


git-svn-id: http://svn.drobilla.net/lad/trunk/suil@3120 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 60 insertions, 58 deletions

diff --git a/wscript b/wscript
index 08a2cfa..b431810 100644
--- a/wscript
+++ b/wscript
@@ -24,73 +24,75 @@ top = '.'
 out = 'build'
 
 def options(opt):
-	autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-	conf.line_just = max(conf.line_just, 56)
-	autowaf.configure(conf)
-	autowaf.display_header('Suil Configuration')
+    conf.line_just = max(conf.line_just, 56)
+    autowaf.configure(conf)
+    autowaf.display_header('Suil Configuration')
 
-	conf.load('compiler_cc')
-	conf.env.append_value('CFLAGS', '-std=c99')
+    conf.load('compiler_cc')
+    conf.env.append_value('CFLAGS', '-std=c99')
 
-	autowaf.check_header(conf, 'lv2/lv2plug.in/ns/extensions/ui/ui.h')
+    autowaf.check_header(conf, 'lv2/lv2plug.in/ns/extensions/ui/ui.h')
 
-	autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
-	                  atleast_version='2.0.0', mandatory=False)
+    autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
+                      atleast_version='2.0.0', mandatory=False)
 
-	autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
-	                  atleast_version='4.0.0', mandatory=False)
+    autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
+                      atleast_version='4.0.0', mandatory=False)
 
-	autowaf.define(conf, 'SUIL_VERSION', SUIL_VERSION)
-	autowaf.define(conf, 'SUIL_MODULE_DIR', conf.env['LIBDIR'] + '/suil')
-	autowaf.define(conf, 'SUIL_DIR_SEP', '/')
-	autowaf.define(conf, 'SUIL_MODULE_EXT', '.so')
-	conf.write_config_header('suil-config.h', remove=False)
+    autowaf.define(conf, 'SUIL_VERSION', SUIL_VERSION)
+    autowaf.define(conf, 'SUIL_MODULE_DIR', conf.env['LIBDIR'] + '/suil')
+    autowaf.define(conf, 'SUIL_DIR_SEP', '/')
+    autowaf.define(conf, 'SUIL_MODULE_EXT', '.so')
+    conf.write_config_header('suil-config.h', remove=False)
 
-	autowaf.display_msg(conf, "Gtk2 Support", conf.is_defined('HAVE_GTK2'))
-	autowaf.display_msg(conf, "Qt4 Support", conf.is_defined('HAVE_QT4'))
-	print('')
+    autowaf.display_msg(conf, "Gtk2 Support", conf.is_defined('HAVE_GTK2'))
+    autowaf.display_msg(conf, "Qt4 Support", conf.is_defined('HAVE_QT4'))
+    print('')
 
 def build(bld):
-	# C Headers
-	bld.install_files('${INCLUDEDIR}/suil', bld.path.ant_glob('suil/*.h'))
-
-	# Pkgconfig file
-	autowaf.build_pc(bld, 'SUIL', SUIL_VERSION, [])
-
-	# Library
-	obj = bld(features = 'c cshlib')
-	obj.export_includes = ['.']
-	obj.source          = 'src/instance.c'
-	obj.target          = 'suil'
-	obj.includes        = ['.']
-	obj.name            = 'libsuil'
-	obj.vnum            = SUIL_LIB_VERSION
-	obj.install_path    = '${LIBDIR}'
-	obj.cflags          = [ '-fvisibility=hidden', '-DSUIL_SHARED', '-DSUIL_INTERNAL' ]
-
-	if bld.is_defined('HAVE_GTK2') and bld.is_defined('HAVE_QT4'):
-		obj = bld(features = 'cxx cxxshlib')
-		obj.source       = 'src/gtk2_in_qt4.cpp'
-		obj.target       = 'suil_gtk2_in_qt4'
-		obj.includes     = ['.']
-		obj.install_path = '${LIBDIR}/suil'
-		obj.cflags       = [ '-fvisibility=hidden', '-DSUIL_SHARED', '-DSUIL_INTERNAL' ]
-		autowaf.use_lib(bld, obj, 'GTK2 QT4')
-
-		obj = bld(features = 'cxx cxxshlib')
-		obj.source       = 'src/qt4_in_gtk2.cpp'
-		obj.target       = 'suil_qt4_in_gtk2'
-		obj.includes     = ['.']
-		obj.install_path = '${LIBDIR}/suil'
-		obj.cflags       = [ '-fvisibility=hidden', '-DSUIL_SHARED', '-DSUIL_INTERNAL' ]
-		autowaf.use_lib(bld, obj, 'GTK2 QT4')
-		
-	# Documentation
-	autowaf.build_dox(bld, 'SUIL', SUIL_VERSION, top, out)
-
-	bld.add_post_fun(autowaf.run_ldconfig)
+    # C Headers
+    bld.install_files('${INCLUDEDIR}/suil', bld.path.ant_glob('suil/*.h'))
+
+    # Pkgconfig file
+    autowaf.build_pc(bld, 'SUIL', SUIL_VERSION, [])
+
+    cflags   = [ '-fvisibility=hidden', '-DSUIL_SHARED', '-DSUIL_INTERNAL' ]
+
+    # Library
+    obj = bld(features        = 'c cshlib',
+              export_includes = ['.'],
+              source          = 'src/instance.c',
+              target          = 'suil',
+              includes        = ['.'],
+              name            = 'libsuil',
+              vnum            = SUIL_LIB_VERSION,
+              install_path    = '${LIBDIR}',
+              cflags          = cflags)
+
+    if bld.is_defined('HAVE_GTK2') and bld.is_defined('HAVE_QT4'):
+        obj = bld(features     = 'cxx cxxshlib',
+                  source       = 'src/gtk2_in_qt4.cpp',
+                  target       = 'suil_gtk2_in_qt4',
+                  includes     = ['.'],
+                  install_path = '${LIBDIR}/suil',
+                  cflags       = cflags)
+        autowaf.use_lib(bld, obj, 'GTK2 QT4')
+
+        obj = bld(features     = 'cxx cxxshlib',
+                  source       = 'src/qt4_in_gtk2.cpp',
+                  target       = 'suil_qt4_in_gtk2',
+                  includes     = ['.'],
+                  install_path = '${LIBDIR}/suil',
+                  cflags       = cflags)
+        autowaf.use_lib(bld, obj, 'GTK2 QT4')
+
+    # Documentation
+    autowaf.build_dox(bld, 'SUIL', SUIL_VERSION, top, out)
+
+    bld.add_post_fun(autowaf.run_ldconfig)
 
 def fix_docs(ctx):
     try:
@@ -107,4 +109,4 @@ def upload_docs(ctx):
     os.system("rsync -avz --delete -e ssh build/doc/html/* drobilla@drobilla.net:~/drobilla.net/docs/suil")
 
 def lint(ctx):
-	subprocess.call('cpplint.py --filter=-whitespace,+whitespace/comments,-build/header_guard,-readability/casting,-readability/todo src/* suil/*', shell=True)
+    subprocess.call('cpplint.py --filter=-whitespace,+whitespace/comments,-build/header_guard,-readability/casting,-readability/todo src/* suil/*', shell=True)