From 221113dc6844bb0beb8d32544601396649c2616c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 18 Jun 2013 16:50:00 +0100
Subject: Fix static build.

---
 test/wscript | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/wscript b/test/wscript
index 43ca7d73..4a2f60a5 100644
--- a/test/wscript
+++ b/test/wscript
@@ -18,7 +18,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST OPENJPEG'
+    obj.uselib = 'BOOST_TEST OPENJPEG CXML'
     obj.use    = 'libdcp'
     obj.source = 'tests.cc'
     obj.target = 'tests'
@@ -26,7 +26,7 @@ def build(bld):
 
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST OPENJPEG'
+    obj.uselib = 'BOOST_TEST OPENJPEG CXML'
     obj.use    = 'libdcp'
     obj.source = 'subs_in_out.cc'
     obj.target = 'subs_in_out'
@@ -34,7 +34,7 @@ def build(bld):
 
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST OPENJPEG'
+    obj.uselib = 'BOOST_TEST OPENJPEG CXML'
     obj.use    = 'libdcp'
     obj.source = 'rewrite_subs.cc'
     obj.target = 'rewrite_subs'
-- 
cgit v1.2.3


From 95d1bfda7b310c70da7f8ce467b7d1eb7d02469c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 20 Jun 2013 11:19:21 +0000
Subject: Include trimming.

---
 src/cpl.cc            |  1 +
 src/subtitle_asset.cc |  1 +
 src/subtitle_asset.h  | 11 +++++++++--
 src/wscript           |  1 -
 test/rewrite_subs.cc  |  1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/src/cpl.cc b/src/cpl.cc
index fd705680..02530357 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -27,6 +27,7 @@
 #include "parse/asset_map.h"
 #include "reel.h"
 #include "metadata.h"
+#include "exceptions.h"
 
 using std::string;
 using std::stringstream;
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index ca91e2c7..2a244a27 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -21,6 +21,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include "subtitle_asset.h"
+#include "parse/subtitle.h"
 #include "util.h"
 #include "xml.h"
 
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 2da1ce7b..a76a3076 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -17,14 +17,21 @@
 
 */
 
+#include <libcxml/cxml.h>
 #include "asset.h"
-#include "xml.h"
 #include "dcp_time.h"
-#include "parse/subtitle.h"
 
 namespace libdcp
 {
 
+namespace parse
+{
+	class Font;
+	class Text;
+	class Subtitle;
+	class LoadFont;
+}
+
 class Subtitle
 {
 public:
diff --git a/src/wscript b/src/wscript
index 67fc2539..37151e51 100644
--- a/src/wscript
+++ b/src/wscript
@@ -51,7 +51,6 @@ def build(bld):
               types.h
               util.h
               version.h
-              xml.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index adb9f6b4..8c055d9e 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -3,6 +3,7 @@
 #include "cpl.h"
 #include "reel.h"
 #include "subtitle_asset.h"
+#include "exceptions.h"
 
 using std::cout;
 using std::cerr;
-- 
cgit v1.2.3