merge with master, including manual merge conflict resolution

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 782cb7be1c90905371d792cbdbbeb9c921c946df..c9c5089d46ccde1c91834e9979680043a4f39d5b 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -379,7 +379,7 @@ def build(bld):
 
     obj.export_includes = ['.']
     obj.includes     = ['.', '../surfaces/control_protocol', '..']
-    obj.name         = 'ardour'
+    obj.name         = 'libardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',