Cleanup: sorting.

[libdcp.git] / tools / wscript

diff --git a/tools/wscript b/tools/wscript
index 0016848909c14f798c72bd1db2c06282e9a89143..3ee04e9457db5960cd8e33a1cf54c76b6b56f879 100644 (file)
--- a/tools/wscript
+++ b/tools/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -32,21 +32,22 @@
 #
 
 def build(bld):
-    obj = bld(features='cxx cxxprogram')
-    obj.use = ['libdcp%s' % bld.env.API_VERSION]
-    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES'
-    obj.source = 'dcpdiff.cc common.cc'
-    obj.target = 'dcpdiff'
+    uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL MAGICK'
 
-    obj = bld(features='cxx cxxprogram')
-    obj.use = ['libdcp%s' % bld.env.API_VERSION]
-    obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES'
-    obj.source = 'dcpinfo.cc common.cc'
-    obj.target = 'dcpinfo'
+    for f in ['diff', 'info', 'verify']:
+        obj = bld(features='cxx cxxprogram')
+        obj.use = ['libdcp%s' % bld.env.API_VERSION]
+        obj.uselib = uselib
+        obj.source = 'dcp%s.cc common.cc' % f
+        obj.target = 'dcp%s' % f
+
+    other = ['dumpsub', 'decryptmxf', 'kdm', 'thumb', 'recover']
+    if not bld.env.DISABLE_DUMPIMAGE:
+        other.append('dumpimage')
 
-    for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb', 'recover', 'verify']:
+    for f in other:
         obj = bld(features='cxx cxxprogram')
         obj.use = ['libdcp%s' % bld.env.API_VERSION]
-        obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM BOOST_REGEX LIBXML++ XMLSEC1 OPENSSL XERCES '
+        obj.uselib = uselib
         obj.source = 'dcp%s.cc' % f
         obj.target = 'dcp%s' % f