1 files changed, 57 insertions, 32 deletions

diff --git a/src/wscript b/src/wscript
index 8923455f..e5f0c2a5 100644
--- a/src/wscript
+++ b/src/wscript
@@ -6,51 +6,64 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdcp'
-    obj.target = 'dcp'
+    obj.name = 'libdcp%s' % bld.env.API_VERSION
+    obj.target = 'dcp%s' % bld.env.API_VERSION
     obj.export_includes = ['.']
     obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1'
-    obj.use = 'libkumu-libdcp libasdcp-libdcp'
+    obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
     obj.source = """
                  argb_frame.cc
                  asset.cc
                  certificates.cc
                  colour_matrix.cc
+                 content.cc
                  cpl.cc
                  dcp.cc        
                  dcp_time.cc
+                 decrypted_kdm.cc
+                 decrypted_kdm_key.cc
+                 encrypted_kdm.cc
                  exceptions.cc
+                 file.cc
+                 font.cc
                  gamma_lut.cc
                  image.cc
-                 kdm.cc
                  key.cc
+                 load_font.cc
+                 local_time.cc
                  metadata.cc
-                 mono_picture_asset.cc
-                 mono_picture_asset_writer.cc
+                 mono_picture_mxf.cc
+                 mono_picture_mxf_writer.cc
                  mono_picture_frame.cc
-                 mxf_asset.cc
-                 picture_asset.cc
-                 picture_asset_writer.cc
-                 rec709_linearised_gamma_lut.cc
+                 mxf.cc
+                 mxf_writer.cc
+                 object.cc
+                 picture_mxf.cc
+                 picture_mxf_writer.cc
                  reel.cc
+                 reel_asset.cc
+                 reel_mono_picture_asset.cc
+                 reel_picture_asset.cc
+                 reel_sound_asset.cc
+                 reel_stereo_picture_asset.cc
+                 reel_subtitle_asset.cc
                  rgb_xyz.cc
                  signer.cc
                  signer_chain.cc
-                 sound_asset.cc
+                 sound_mxf.cc
+                 sound_mxf_writer.cc
                  sound_frame.cc
-                 srgb_linearised_gamma_lut.cc
-                 stereo_picture_asset.cc
-                 stereo_picture_asset_writer.cc
+                 stereo_picture_mxf.cc
+                 stereo_picture_mxf_writer.cc
                  stereo_picture_frame.cc
-                 subtitle_asset.cc
+                 subtitle.cc
+                 subtitle_content.cc
+                 subtitle_string.cc
+                 text.cc
                  types.cc
                  util.cc
                  version.cc
                  xyz_frame.cc
-                 parse/asset_map.cc
-                 parse/cpl.cc
-                 parse/pkl.cc
-                 parse/subtitle.cc
                  """
 
     headers = """
@@ -58,40 +71,52 @@ def build(bld):
               certificates.h
               colour_matrix.h
               cpl.h
+              content.h
               dcp.h
               dcp_time.h
+              decrypted_kdm.h
+              decrypted_kdm_key.h
+              encrypted_kdm.h
               exceptions.h
               gamma_lut.h
               image.h
-              kdm.h
               key.h
-              lut.h
+              local_time.h
               lut_cache.h
               metadata.h
-              mono_picture_asset.h
+              mono_picture_mxf.h
               mono_picture_frame.h
-              mxf_asset.h
-              picture_asset.h
-              picture_asset_writer.h
+              mxf.h
+              mxf_writer.h
+              object.h
+              picture_mxf.h
+              picture_mxf_writer.h
               raw_convert.h
               rgb_xyz.h
-              rec709_linearised_gamma_lut.h
               reel.h
+              reel_asset.h
+              reel_mono_picture_asset.h
+              reel_picture_asset.h
+              reel_sound_asset.h
+              reel_stereo_picture_asset.h
+              ref.h
               argb_frame.h
               signer.h
               signer_chain.h
-              sound_asset.h
               sound_frame.h
-              srgb_linearised_gamma_lut.h
-              stereo_picture_asset.h
+              sound_mxf.h
+              sound_mxf_writer.h
+              stereo_picture_mxf.h
               stereo_picture_frame.h
-              subtitle_asset.h
+              subtitle.h
+              subtitle_content.h
+              subtitle_string.h
               types.h
               util.h
               version.h
               xyz_frame.h
               """
 
-    bld.install_files('${PREFIX}/include/libdcp', headers)
+    bld.install_files('${PREFIX}/include/libdcp%s/dcp' % bld.env.API_VERSION, headers)
     if bld.env.STATIC:
-        bld.install_files('${PREFIX}/lib', 'libdcp.a')
+        bld.install_files('${PREFIX}/lib', 'libdcp%s.a' % bld.env.API_VERSION)