Merge branch 'master' into cxml

[libdcp.git] / asdcplib / src / wscript

diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
index ad6cfbabdbeb779bf4ac2020cf5f4b3167961357..661971ac20189d7c1155c86da889755e33850873 100644 (file)
--- a/asdcplib/src/wscript
+++ b/asdcplib/src/wscript
@@ -8,7 +8,7 @@ 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')
@@ -27,7 +27,7 @@ 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')
@@ -66,9 +66,6 @@ def build(bld):
                  MDD.cpp
                  """
 
-    if bld.env.STATIC_LIBDCP:
+    if bld.env.STATIC:
         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')