Some OS X build fixes.

[libdcp.git] / asdcplib / src / wscript

diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
index ad6cfbabdbeb779bf4ac2020cf5f4b3167961357..62f3a00955ed9d6d1f0d05628c8d887f95381c62 100644 (file)
--- a/asdcplib/src/wscript
+++ b/asdcplib/src/wscript
@@ -8,13 +8,13 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DASDCP_PLATFORM="linux"')
 
 def build(bld):
-    if bld.env.STATIC_LIBDCP:
+    if bld.env.STATIC:
         obj = bld(features = 'cxx cxxstlib')
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libkumu-libdcp'
-    obj.target = 'kumu-libdcp'
+    obj.name = 'libkumu-libdcp%s' % bld.env.API_VERSION
+    obj.target = 'kumu-libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENSSL BOOST_FILESYSTEM'
     obj.includes = ['.']
     obj.export_includes = ['.']
@@ -27,15 +27,15 @@ def build(bld):
                  KM_prng.cpp
                  """
 
-    if bld.env.STATIC_LIBDCP:
+    if bld.env.STATIC:
         obj = bld(features = 'cxx cxxstlib')
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libasdcp-libdcp'
-    obj.target = 'asdcp-libdcp'
+    obj.name = 'libasdcp-libdcp%s' % bld.env.API_VERSION
+    obj.target = 'asdcp-libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENSSL'
-    obj.use = 'libkumu-libdcp'
+    obj.use = 'libkumu-libdcp%s' % bld.env.API_VERSION
     obj.includes = ['.']
     obj.export_includes = ['.']
     obj.source = """
@@ -66,9 +66,6 @@ def build(bld):
                  MDD.cpp
                  """
 
-    if bld.env.STATIC_LIBDCP:
-        bld.install_files('${PREFIX}/lib', 'libkumu-libdcp.a')
-        bld.install_files('${PREFIX}/lib', 'libasdcp-libdcp.a')
-    else:
-        bld.install_files('${PREFIX}/lib', 'libkumu-libdcp.so')
-        bld.install_files('${PREFIX}/lib', 'libasdcp-libdcp.so')
+    if bld.env.STATIC:
+        bld.install_files('${PREFIX}/lib', 'libkumu-libdcp%s.a' % bld.env.API_VERSION)
+        bld.install_files('${PREFIX}/lib', 'libasdcp-libdcp%s.a' % bld.env.API_VERSION)