Use modern terser waf syntax.

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

12 files changed, 126 insertions, 139 deletions

diff --git a/src/client/wscript b/src/client/wscript
index 9466300e..5238b4bf 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -2,35 +2,36 @@
 from waflib.extras import autowaf as autowaf
 
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    obj = bld(features        = 'cxx cxxshlib',
+              includes        = ['..', '../..', '../../include'],
+              export_includes = ['../../include'],
+              name            = 'libingen_client',
+              target          = 'ingen_client',
+              install_path    = '${LIBDIR}',
+              use             = 'libingen_shared')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV SUIL RAUL SORD SOUP SIGCPP LIBLO SOUP')
+
     obj.source = '''
-            ClientStore.cpp
-            NodeModel.cpp
-            ObjectModel.cpp
-            PatchModel.cpp
-            PluginModel.cpp
-            PluginUI.cpp
-            PortModel.cpp
-            ThreadedSigClientInterface.cpp
-            ingen_client.cpp
+        ClientStore.cpp
+        NodeModel.cpp
+        ObjectModel.cpp
+        PatchModel.cpp
+        PluginModel.cpp
+        PluginUI.cpp
+        PortModel.cpp
+        ThreadedSigClientInterface.cpp
+        ingen_client.cpp
     '''
 
     if bld.is_defined('HAVE_SOUP'):
         obj.source += '''
-                HTTPClientReceiver.cpp
-                HTTPEngineSender.cpp
+            HTTPClientReceiver.cpp
+            HTTPEngineSender.cpp
         '''
 
     if bld.is_defined('HAVE_LIBLO'):
         obj.source += '''
-                OSCClientReceiver.cpp
-                OSCEngineSender.cpp
+            OSCClientReceiver.cpp
+            OSCEngineSender.cpp
         '''
 
-    obj.includes        = ['.', '..', '../..', '../../include']
-    obj.export_includes = ['../../include']
-    obj.name            = 'libingen_client'
-    obj.target          = 'ingen_client'
-    obj.install_path    = '${LIBDIR}'
-    obj.use             = 'libingen_shared'
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV SUIL RAUL SORD SOUP SIGCPP LIBLO SOUP')
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 3cadb506..2c5c968a 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -21,8 +21,9 @@
 #include "ingen/ServerInterface.hpp"
 #include "ingen/client/PatchModel.hpp"
 
+#include "shared/LV2URIMap.hpp"
+
 #include "App.hpp"
-#include "LV2URIMap.hpp"
 #include "NodeControlWindow.hpp"
 #include "NodeModule.hpp"
 #include "PatchCanvas.hpp"
diff --git a/src/gui/wscript b/src/gui/wscript
index ca254d45..bac2127d 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,7 +3,30 @@ from waflib.extras import autowaf as autowaf
 import waflib.Utils as Utils
 
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    obj = bld(features        = 'cxx cxxshlib',
+              export_includes = ['../../include'],
+              includes        = ['..', '../..', '../../include'],
+              name            = 'libingen_gui',
+              target          = 'ingen_gui',
+              install_path    = '${LIBDIR}',
+              use             = 'libingen_shared libingen_client libingen_serialisation')
+    autowaf.use_lib(bld, obj, '''
+            CURL
+            FLOWCANVAS
+            GLADEMM
+            GLIBMM
+            GNOMECANVASMM
+            GTKMM
+            LILV
+            LV2CORE
+            RAUL
+            SIGCPP
+            SORD
+            SOUP
+            SUIL
+            WEBKIT
+    ''')
+
     obj.source = '''
             App.cpp
             BreadCrumbs.cpp
@@ -42,33 +65,10 @@ def build(bld):
     if bld.is_defined('HAVE_CURL'):
         obj.source += 'UploadPatchWindow.cpp'
 
-    obj.export_includes = ['.']
-    obj.includes        = ['.', '..', '../..', '../../include', '../client', '../module']
-    obj.name            = 'libingen_gui'
-    obj.target          = 'ingen_gui'
-    obj.install_path    = '${LIBDIR}'
-    obj.use             = 'libingen_shared libingen_client libingen_serialisation'
-    autowaf.use_lib(bld, obj, '''
-            CURL
-            FLOWCANVAS
-            GLADEMM
-            GLIBMM
-            GNOMECANVASMM
-            GTKMM
-            LILV
-            LV2CORE
-            RAUL
-            SIGCPP
-            SORD
-            SOUP
-            SUIL
-            WEBKIT
-    ''')
-
     # XML UI definition
     bld(features      = 'subst',
         source        = 'ingen_gui.ui',
         target        = '../../ingen_gui.ui',
         install_path  = '${DATADIR}/ingen',
         chmod         = Utils.O755,
-            INGEN_VERSION = bld.env['INGEN_VERSION'])
+        INGEN_VERSION = bld.env['INGEN_VERSION'])
diff --git a/src/ingen/wscript b/src/ingen/wscript
deleted file mode 100644
index b5c09105..00000000
--- a/src/ingen/wscript
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-from waflib.extras import autowaf as autowaf
-
-def build(bld):
-    obj = bld(features = 'c cxx cxxprogram')
-    obj.target       = 'ingen'
-    obj.source       = 'main.cpp'
-    obj.includes     = ['..', '../..', '../../include']
-    obj.defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
-    obj.use          = 'libingen_shared'
-    obj.install_path = '${BINDIR}'
-    autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL LV2CORE LILV INGEN LIBLO SOUP')
-
-    bld.install_files('${DATADIR}/applications', 'ingen.desktop')
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 1fbe8e12..dffe9ac0 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -2,16 +2,12 @@
 from waflib.extras import autowaf as autowaf
 
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = '''
-            Parser.cpp
-            Serialiser.cpp
-            serialisation.cpp
-    '''
-    obj.export_includes = ['.']
-    obj.includes        = ['.', '..', '../..', '../../include']
-    obj.name            = 'libingen_serialisation'
-    obj.target          = 'ingen_serialisation'
-    obj.install_path    = '${LIBDIR}'
-    obj.use             = 'libingen_shared'
+    obj = bld(features        = 'cxx cxxshlib',
+              source          = 'Parser.cpp Serialiser.cpp serialisation.cpp',
+              export_includes = ['../../include'],
+              includes        = ['..', '../../include'],
+              name            = 'libingen_serialisation',
+              target          = 'ingen_serialisation',
+              install_path    = '${LIBDIR}',
+              use             = 'libingen_shared')
     autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD')
diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp
index 7a8e7c48..86b5e835 100644
--- a/src/server/AudioBuffer.cpp
+++ b/src/server/AudioBuffer.cpp
@@ -16,13 +16,16 @@
  */
 
 #include <stdlib.h>
-#include <cassert>
-#include "raul/log.hpp"
-#include "raul/SharedPtr.hpp"
+#include <assert.h>
+
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "raul/SharedPtr.hpp"
+#include "raul/log.hpp"
+
+#include "shared/LV2Features.hpp"
+
 #include "AudioBuffer.hpp"
 #include "ProcessContext.hpp"
-#include "LV2Features.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp
index 566277e7..83c77ace 100644
--- a/src/server/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -25,9 +25,9 @@
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 
 #include "shared/World.hpp"
+#include "shared/LV2Features.hpp"
 
 #include "LV2EventFeature.hpp"
-#include "LV2Features.hpp"
 #include "LV2Info.hpp"
 #include "LV2RequestRunFeature.hpp"
 #include "LV2ResizeFeature.hpp"
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index 6364266e..125beaee 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -26,12 +26,13 @@
 #include "raul/Maid.hpp"
 #include "raul/Array.hpp"
 
+#include "shared/LV2URIMap.hpp"
+
 #include "AudioBuffer.hpp"
 #include "EventBuffer.hpp"
 #include "InputPort.hpp"
 #include "LV2Node.hpp"
 #include "LV2Plugin.hpp"
-#include "LV2URIMap.hpp"
 #include "MessageContext.hpp"
 #include "OutputPort.hpp"
 #include "ProcessContext.hpp"
diff --git a/src/server/LV2Node.hpp b/src/server/LV2Node.hpp
index 6fc91afc..06c79c20 100644
--- a/src/server/LV2Node.hpp
+++ b/src/server/LV2Node.hpp
@@ -19,12 +19,15 @@
 #define INGEN_ENGINE_LV2NODE_HPP
 
 #include <string>
+
 #include <boost/intrusive_ptr.hpp>
+
 #include "lilv/lilv.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
-#include "types.hpp"
+
 #include "NodeImpl.hpp"
-#include "LV2Features.hpp"
+#include "shared/LV2Features.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index d4d947d1..f89d1c53 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -21,12 +21,12 @@
 #include "raul/Maid.hpp"
 
 #include "shared/LV2URIMap.hpp"
+#include "shared/LV2Atom.hpp"
 
 #include "AudioBuffer.hpp"
 #include "BufferFactory.hpp"
 #include "Engine.hpp"
 #include "EventBuffer.hpp"
-#include "LV2Atom.hpp"
 #include "NodeImpl.hpp"
 #include "Notification.hpp"
 #include "ObjectBuffer.hpp"
diff --git a/src/server/wscript b/src/server/wscript
index e0c7a7d1..9b486d25 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -55,65 +55,58 @@ def build(bld):
             internals/Trigger.cpp
     '''
 
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = core_source
-    obj.export_includes = ['.']
-    obj.includes        = ['.', '..', '../..', '../../include']
-    obj.name            = 'libingen_server'
-    obj.target          = 'ingen_server'
-    obj.install_path    = '${LIBDIR}'
-    obj.use             = 'libingen_shared'
+    obj = bld(features        = 'cxx cxxshlib',
+              source          = core_source,
+              export_includes = ['../../include'],
+              includes        = ['.', '..', '../..', '../../include'],
+              name            = 'libingen_server',
+              target          = 'ingen_server',
+              install_path    = '${LIBDIR}',
+              use             = 'libingen_shared')
     core_libs = 'GLIBMM GTHREAD LV2CORE LILV RAUL SORD'
     autowaf.use_lib(bld, obj, core_libs)
 
     if bld.is_defined('HAVE_SOUP'):
-        obj = bld(features = 'cxx cxxshlib')
-        obj.source = '''
-                HTTPClientSender.cpp
-                HTTPEngineReceiver.cpp
-                ingen_http.cpp
-        '''
-        obj.includes     = ['.', '..', '../..', '../../include', '../server']
-        obj.name         = 'libingen_http'
-        obj.target       = 'ingen_http'
-        obj.install_path = '${LIBDIR}'
-        obj.use          = 'libingen_server'
+        obj = bld(features     = 'cxx cxxshlib',
+                  source       = '''HTTPClientSender.cpp
+                                    HTTPEngineReceiver.cpp
+                                    ingen_http.cpp''',
+                  includes     = ['.', '..', '../..', '../../include'],
+                  name         = 'libingen_http',
+                  target       = 'ingen_http',
+                  install_path = '${LIBDIR}',
+                  use          = 'libingen_server')
         autowaf.use_lib(bld, obj, core_libs + ' SOUP')
 
     if bld.is_defined('HAVE_LIBLO'):
-        obj = bld(features = 'cxx cxxshlib')
-        obj.source = '''
-                OSCClientSender.cpp
-                OSCEngineReceiver.cpp
-                ingen_osc.cpp
-        '''
-        obj.export_includes = ['.']
-        obj.includes        = ['.', '..', '../..', '../../include', '../server']
-        obj.name            = 'libingen_osc'
-        obj.target          = 'ingen_osc'
-        obj.install_path    = '${LIBDIR}'
-        obj.use             = 'libingen_server'
+        obj = bld(features        = 'cxx cxxshlib',
+                  source          = '''OSCClientSender.cpp
+                                       OSCEngineReceiver.cpp
+                                       ingen_osc.cpp''',
+                  includes        = ['.', '..', '../..', '../../include'],
+                  name            = 'libingen_osc',
+                  target          = 'ingen_osc',
+                  install_path    = '${LIBDIR}',
+                  use             = 'libingen_server')
         autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
 
     if bld.is_defined('HAVE_JACK'):
-        obj = bld(features = 'cxx cxxshlib')
-        obj.source = 'JackDriver.cpp ingen_jack.cpp'
-        obj.export_includes = ['.']
-        obj.includes        = ['.', '..', '../..', '../../include', '../server']
-        obj.name            = 'libingen_jack'
-        obj.target          = 'ingen_jack'
-        obj.install_path    = '${LIBDIR}'
-        obj.use             = 'libingen_server'
+        obj = bld(features        = 'cxx cxxshlib',
+                  source          = 'JackDriver.cpp ingen_jack.cpp',
+                  includes        = ['.', '..', '../..', '../../include'],
+                  name            = 'libingen_jack',
+                  target          = 'ingen_jack',
+                  install_path    = '${LIBDIR}',
+                  use             = 'libingen_server')
         autowaf.use_lib(bld, obj, core_libs + ' JACK')
 
     # Ingen LV2 wrapper
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source = ' ingen_lv2.cpp '
-    obj.export_includes = ['.']
-    obj.includes        = ['.', '..', '../..', '../../include']
-    obj.name            = 'libingen_lv2'
-    obj.target          = 'ingen_lv2'
-    #obj.install_path    = '${LIBDIR}'
-    obj.install_path    = '${LV2DIR}/ingen.lv2/'
-    obj.use             = 'libingen_server libingen_shared'
+    obj = bld(features = 'cxx cxxshlib',
+    source = ' ingen_lv2.cpp ',
+    includes        = ['.', '..', '../..', '../../include'],
+    name            = 'libingen_lv2',
+    target          = 'ingen_lv2',
+    #install_path    = '${LIBDIR}',
+    install_path    = '${LV2DIR}/ingen.lv2/',
+    use             = 'libingen_server libingen_shared')
     autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/shared/wscript b/src/shared/wscript
index 51b7b5a5..1a8fd389 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -2,7 +2,16 @@
 from waflib.extras import autowaf as autowaf
 
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    obj = bld(features        = 'cxx cxxshlib',
+              export_includes = ['../../include'],
+              includes        = ['..', '../..', '../../include'],
+              name            = 'libingen_shared',
+              target          = 'ingen_shared',
+              vnum            = '0.0.0',
+              install_path    = '${LIBDIR}',
+              linkflags       = '-ldl')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD LIBLO')
+
     obj.source = '''
             Builder.cpp
             ClashAvoider.cpp
@@ -15,16 +24,10 @@ def build(bld):
             World.cpp
             runtime_paths.cpp
     '''
+
     if bld.is_defined('HAVE_LIBLO'):
         obj.source += ' OSCSender.cpp '
+
     if bld.is_defined('HAVE_SOUP'):
         autowaf.use_lib(bld, obj, 'SOUP')
         obj.source += ' HTTPSender.cpp '
-    obj.export_includes = ['.']
-    obj.includes        = ['.', '..', '../..', '../../include']
-    obj.name            = 'libingen_shared'
-    obj.target          = 'ingen_shared'
-    obj.vnum            = '0.0.0'
-    obj.install_path    = '${LIBDIR}'
-    obj.linkflags       = '-ldl'
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD LIBLO')