Build fix.

[asdcplib-cth.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index c60dd16e4e4b9c115bc66f79630460569cc45a57..62e9b21bc1c0f5037150db8102a80f2de0d6b0c0 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,6 +1,11 @@
 def configure(conf):
     conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')
-    conf.env.append_value('CXXFLAGS', '-DPACKAGE_VERSION="%s"' % conf.env.VERSION)
+    # Don't include the micro version number in PACKAGE_VERSION, as
+    # this ends up in MXFs and screws up DCP-o-matic's test references
+    # every time it changes
+    s = conf.env.VERSION.split('.')
+    major_minor = '%s.%s.0' % (s[0], s[1])
+    conf.env.append_value('CXXFLAGS', ['-DPACKAGE_VERSION="%s"' % major_minor])
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DASDCP_PLATFORM="win32"')
         conf.env.append_value('CXXFLAGS', '-DKM_WIN32')
@@ -34,7 +39,7 @@ def build(bld):
 
     obj.name = 'libasdcp-cth'
     obj.target = 'asdcp-cth'
-    obj.uselib = 'OPENSSL'
+    obj.uselib = 'OPENSSL BOOST_FILESYSTEM'
     obj.use = 'libkumu-cth'
     obj.includes = ['.']
     obj.export_includes = ['.']
@@ -75,44 +80,25 @@ def build(bld):
                  """
 
     headers = """
-                 KM_xml.h
-                 KM_error.h
-                 SyncEncoder.h
-                 ST2095_PinkNoise.h
-                 MXF.h
-                 Wav.h
-                 Metadata.h
-                 KM_mutex.h
-                 JP2K.h
-                 AtmosSyncChannel_Mixer.h
-                 AtmosSyncChannel_Generator.h
-                 SyncCommon.h
-                 AS_02.h
-                 AS_02_internal.h
-                 KM_tai.h
-                 KLV.h
-                 PCMParserList.h
-                 AS_DCP_internal.h
-                 KM_log.h
-                 AS_02_PHDR.h
-                 UUIDInformation.h
-                 KM_memio.h
-                 KM_prng.h
-                 KM_fileio.h
-                 MXFTypes.h
-                 AS_DCP.h
-                 KM_util.h
-                 AS_DCP_DCData_internal.h
-                 MDD.h
-                 MPEG.h
-                 WavFileWriter.h
-                 S12MTimecode.h
-                 KM_platform.h
-                 PCMDataProviders.h
-                 CRC16.h
-                 """
+              asdcp/KM_util.h
+              asdcp/KM_memio.h
+              asdcp/KM_platform.h
+              asdcp/KM_error.h
+              asdcp/KM_tai.h
+              asdcp/KM_fileio.h
+              asdcp/KM_prng.h
+              asdcp/KM_log.h
+              asdcp/KM_mutex.h
+              asdcp/AS_DCP.h
+              asdcp/AS_02.h
+              asdcp/Metadata.h
+              asdcp/MXF.h
+              asdcp/MXFTypes.h
+              asdcp/KLV.h
+              asdcp/MDD.h
+              """
 
-    bld.install_files('${PREFIX}/include/libasdcp-cth', headers)
+    bld.install_files('${PREFIX}/include/libasdcp-cth/asdcp', headers)
     if bld.env.STATIC:
         bld.install_files('${PREFIX}/lib', 'libkumu-cth.a')
         bld.install_files('${PREFIX}/lib', 'libasdcp-cth.a')