Merge branch 'master' into 1.0

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index fd9f945b424f6f9611ed014bc9d4ad59fc157bfd..c06ca1bd4795d34fae0762910a6717d40e7ec4a1 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -6,11 +6,11 @@ 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
@@ -68,6 +68,7 @@ def build(bld):
               certificates.h
               colour_matrix.h
               cpl.h
+              content.h
               dcp.h
               dcp_time.h
               exceptions.h
@@ -86,14 +87,22 @@ def build(bld):
               picture_mxf_writer.h
               rgb_xyz.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_mxf.h
               sound_frame.h
+              sound_mxf.h
+              sound_mxf_writer.h
               stereo_picture_mxf.h
               stereo_picture_frame.h
               subtitle.h
+              subtitle_content.h
               subtitle_string.h
               types.h
               util.h
@@ -101,6 +110,6 @@ def build(bld):
               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)