Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index 81c3992668ea54945957e479be196d799506e1d6..db4efda1c7e468b644500788775644f1ed4d6fc8 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,5 +1,5 @@
 def build(bld):
-    if bld.env.STATIC_LIBDCP:
+    if bld.env.STATIC:
         obj = bld(features = 'cxx cxxstlib')
     else:
         obj = bld(features = 'cxx cxxshlib')
@@ -7,38 +7,44 @@ def build(bld):
     obj.name = 'libdcp'
     obj.target = 'dcp'
     obj.export_includes = ['.']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 OPENSSL SIGC++ LIBXML++ OPENJPEG'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1'
     obj.use = 'libkumu-libdcp libasdcp-libdcp'
     obj.source = """
+                 argb_frame.cc
                  asset.cc
-                 asset_map.cc
-                 cpl_file.cc
-                 dcp.cc        
+                 certificates.cc
+                 crypt_chain.cc
                  cpl.cc
+                 dcp.cc        
                  dcp_time.cc
                  gamma_lut.cc
+                 kdm.cc
                  metadata.cc
                  mxf_asset.cc
                  picture_asset.cc
                  picture_frame.cc
-                 pkl_file.cc
                  reel.cc
-                 argb_frame.cc
                  sound_asset.cc
                  sound_frame.cc
                  subtitle_asset.cc
                  types.cc
                  util.cc
                  version.cc
-                 xml.cc
+                 parse/asset_map.cc
+                 parse/cpl.cc
+                 parse/pkl.cc
+                 parse/subtitle.cc
                  """
 
     headers = """
               asset.h
+              certificates.h
               cpl.h
+              crypt_chain.h
               dcp.h
               dcp_time.h
               exceptions.h
+              kdm.h
               metadata.h
               mxf_asset.h
               picture_asset.h
@@ -51,9 +57,9 @@ def build(bld):
               types.h
               util.h
               version.h
-              xml.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)
-    if bld.env.STATIC_LIBDCP:
+    if bld.env.STATIC:
         bld.install_files('${PREFIX}/lib', 'libdcp.a')
+