Add bbt_add that does not take Metric parameter.

[ardour.git] / libs / libgnomecanvasmm / SConscript

diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript
index 7cab8b707a9a0f952f44de664c442a0c7050ed56..273fbe84df3f7565e80ce4010198bb7144faa6c3 100644 (file)
--- a/libs/libgnomecanvasmm/SConscript
+++ b/libs/libgnomecanvasmm/SConscript
@@ -7,7 +7,7 @@ import glob
 gnomecanvasmm_files = glob.glob('libgnomecanvasmm/*.cc')
 
 Import('env libraries install_prefix')
-gnomecanvasmm = env.Copy()
+gnomecanvasmm = env.Clone()
 gnomecanvasmm.Merge([libraries['glibmm2'],
                      libraries['gtk2'],
                      libraries['sigc2'],
@@ -15,12 +15,16 @@ gnomecanvasmm.Merge([libraries['glibmm2'],
                      libraries['atkmm'],
                      libraries['gdkmm2'],
                      libraries['gtkmm2'],
-                     libraries['libgnomecanvas2'] ])
+                     libraries['libgnomecanvas2'],
+                     libraries['cairomm']])
+
+if gnomecanvasmm['IS_OSX']:
+       gnomecanvasmm.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
 
 libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
 Default(libgnomecanvasmm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgnomecanvasmm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgnomecanvasmm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +