make copies of global lists before extending

[ardour.git] / libs / gtkmm2ext / wscript

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index d9af1f8062ba86cd88ed3391958e5d461454e1e0..1832d6a03e05268ee58e87d66459c9e2c4499a09 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -23,6 +23,7 @@ I18N_PACKAGE = 'gtkmm2ext3'
 gtkmm2ext_sources = [
         'actions.cc',
         'application.cc',
+        'ardour_icon.cc',
         'auto_spin.cc',
         'barcontroller.cc',
         'binding_proxy.cc',
@@ -40,7 +41,6 @@ gtkmm2ext_sources = [
         'debug.cc',
         'dndtreeview.cc',
         'emscale.cc',
-        'fastmeter.cc',
         'focus_entry.cc',
         'grouped_buttons.cc',
         'gtk_ui.cc',
@@ -84,12 +84,19 @@ def configure(conf):
 
 
 def build(bld):
+    # operate on copy to avoid adding sources twice
+    sources = list(gtkmm2ext_sources)
+    if bld.is_tracks_build():
+        sources += [ 'waves_fastmeter.cc', 'fader.cc' ]
+    else:
+        sources += [ 'fastmeter.cc' ]
+
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=gtkmm2ext_sources)
+        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
         # defines for this library
         obj.defines      = [ 'LIBGTKMM2EXT_DLL_EXPORTS', 'ABSTRACT_UI_EXPORTS' ]
     else:
-        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=gtkmm2ext_sources)
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.defines      = [ ]
 
@@ -98,7 +105,7 @@ def build(bld):
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
     obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
-    obj.use          = [ 'libpbd' ]
+    obj.use          = [ 'libpbd', 'libardour' ]
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
     obj.defines     += [