remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

[ardour.git] / libs / canvas / wscript

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index d4b9ad41770070e2600676cb4b5495ee2cd41f7e..0c5192645c43d3683c213f6521af79c75bf17896 100644 (file)
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -34,6 +34,7 @@ canvas_sources = [
         'circle.cc',
         'curve.cc',
         'debug.cc',
+        'drag_handle.cc',
         'item.cc',
         'fill.cc',
         'flag.cc',
@@ -49,6 +50,7 @@ canvas_sources = [
         'polygon.cc',
         'rectangle.cc',
         'root_group.cc',
+        'stateful_image.cc',
         'text.cc',
         'types.cc',
         'utils.cc',
@@ -61,12 +63,16 @@ def options(opt):
 def configure(conf):
     conf.load ('compiler_cxx')
     autowaf.configure(conf)
+    autowaf.build_version_files(path_prefix+'canvas/version.h', path_prefix+'version.cc',
+                                'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], 0,
+                                'LIBCANVAS_API', 'canvas/visibility.h')
     autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
 
 def build(bld):
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj = bld.shlib(features = 'cxx cxxshlib', source=canvas_sources)
+        obj.defines      = [ 'LIBCANVAS_DLL_EXPORTS=1' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
         obj.cxxflags     = [ '-fPIC' ]
@@ -79,8 +85,8 @@ def build(bld):
     obj.name         = 'libcanvas'
     obj.target       = 'canvas'
     obj.vnum         = CANVAS_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.defines      = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
+    obj.install_path = bld.env['LIBDIR']
+    obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
     
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']: