X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpanners%2Fwscript;h=3ee237f2f6a04f8e988fe1b14f96545653d8032c;hb=9740fb7d760c96acf9794e0e6bca710c7782c71b;hp=02e741b8e07e9874fa9e4588b580c97fe581a68b;hpb=9850407bd9178de794a7507ad858bcdfa227c842;p=ardour.git

diff --git a/libs/panners/wscript b/libs/panners/wscript
index 02e741b8e0..3ee237f2f6 100644
--- a/libs/panners/wscript
+++ b/libs/panners/wscript
@@ -1,27 +1,38 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
+from waflib import Options
 import os
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-panners = [ '2in2out', '1in2out', 'vbap' ]
 
-def set_options(opt):
-        autowaf.set_options(opt)
+def options(opt):
+
+    autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-        conf.sub_config(name)
-        autowaf.set_local_lib(conf, name, has_objects)
+    conf.recurse(name)
+    autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
-        autowaf.set_recursive()
-        autowaf.configure(conf)
+    autowaf.set_recursive()
+    autowaf.configure(conf)
+
+    if conf.is_tracks_build():
+        panners = [ '1in2out', 'vbap', 'stereobalance' ]
+    else:
+        panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ]
 
-        for i in panners:
-        	sub_config_and_use(conf, i)
+    for i in panners:
+        sub_config_and_use(conf, i)
 
 def build(bld):
-        for i in panners:
-            bld.add_subdirs(i)
+    if bld.is_tracks_build():
+        panners = [ '1in2out', 'vbap', 'stereobalance' ]
+    else:
+        panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ]
+
+    for i in panners:
+        bld.recurse(i)