From 797916ae28d976f3c5be62d37b45864219af6098 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 13 May 2013 14:20:36 +0100
Subject: Use libcxml.  Lump all static configuration flags into one.

---
 src/wscript | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/wscript')

diff --git a/src/wscript b/src/wscript
index 81c39926..fb8f688e 100644
--- 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,7 +7,7 @@ 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 OPENSSL SIGC++ LIBXML++ OPENJPEG CXML'
     obj.use = 'libkumu-libdcp libasdcp-libdcp'
     obj.source = """
                  asset.cc
@@ -30,7 +30,6 @@ def build(bld):
                  types.cc
                  util.cc
                  version.cc
-                 xml.cc
                  """
 
     headers = """
@@ -51,9 +50,8 @@ 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')
-- 
cgit v1.2.3