Split test compile up into individual files.

16 files changed, 40 insertions, 40 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3709807b7..b78622a90 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/lib/wscript b/src/lib/wscript
index f6e7f8388..0d3f2913c 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -63,7 +63,7 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name = 'libdcpomatic'
-    obj.export_includes = ['.']
+    obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 8727761fd..7c5852fcc 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -21,16 +21,16 @@
 #include <iomanip>
 #include <getopt.h>
 #include <libdcp/version.h>
-#include "film.h"
-#include "filter.h"
-#include "transcode_job.h"
-#include "job_manager.h"
-#include "util.h"
-#include "scaler.h"
-#include "version.h"
-#include "cross.h"
-#include "config.h"
-#include "log.h"
+#include "lib/film.h"
+#include "lib/filter.h"
+#include "lib/transcode_job.h"
+#include "lib/job_manager.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+#include "lib/version.h"
+#include "lib/cross.h"
+#include "lib/config.h"
+#include "lib/log.h"
 
 using std::string;
 using std::cerr;
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index d3a353154..1bfc23ff9 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -20,7 +20,7 @@
 #include <boost/thread.hpp>
 #include <wx/taskbar.h>
 #include <wx/icon.h>
-#include "wx_util.h"
+#include "wx/wx_util.h"
 #include "lib/util.h"
 #include "lib/server.h"
 #include "lib/config.h"
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index b0c84b4eb..eff10a897 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -32,15 +32,15 @@
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
-#include "config.h"
-#include "dcp_video_frame.h"
-#include "exceptions.h"
-#include "util.h"
-#include "config.h"
-#include "scaler.h"
-#include "image.h"
-#include "log.h"
-#include "version.h"
+#include "lib/config.h"
+#include "lib/dcp_video_frame.h"
+#include "lib/exceptions.h"
+#include "lib/util.h"
+#include "lib/config.h"
+#include "lib/scaler.h"
+#include "lib/image.h"
+#include "lib/log.h"
+#include "lib/version.h"
 
 using std::cerr;
 using std::string;
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 7b2955e27..82f589f6f 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -20,8 +20,8 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <wx/wx.h>
-#include "util.h"
-#include "audio_analysis.h"
+#include "lib/util.h"
+#include "lib/audio_analysis.h"
 
 class AudioPlot : public wxPanel
 {
diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc
index df3a24f62..d84629e57 100644
--- a/src/wx/dci_metadata_dialog.cc
+++ b/src/wx/dci_metadata_dialog.cc
@@ -18,9 +18,9 @@
 */
 
 #include <wx/sizer.h>
+#include "lib/film.h"
 #include "dci_metadata_dialog.h"
 #include "wx_util.h"
-#include "film.h"
 
 using boost::shared_ptr;
 
diff --git a/src/wx/dci_metadata_dialog.h b/src/wx/dci_metadata_dialog.h
index fbc5e3b86..c20eb3b23 100644
--- a/src/wx/dci_metadata_dialog.h
+++ b/src/wx/dci_metadata_dialog.h
@@ -20,7 +20,7 @@
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
 #include <boost/shared_ptr.hpp>
-#include "dci_metadata.h"
+#include "lib/dci_metadata.h"
 
 class Film;
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4ae3743b3..8f391f5cd 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -39,18 +39,18 @@
 #include "lib/imagemagick_content.h"
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/sound_processor.h"
+#include "lib/scaler.h"
+#include "timecode.h"
 #include "filter_dialog.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "gain_calculator_dialog.h"
-#include "sound_processor.h"
 #include "dci_metadata_dialog.h"
-#include "scaler.h"
 #include "audio_dialog.h"
 #include "imagemagick_content_dialog.h"
 #include "timeline_dialog.h"
 #include "audio_mapping_view.h"
-#include "timecode.h"
 
 using std::string;
 using std::cout;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index d42829880..1fa7bdb91 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -37,9 +37,9 @@
 #include "lib/video_content.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/imagemagick_content.h"
+#include "lib/video_decoder.h"
 #include "film_viewer.h"
 #include "wx_util.h"
-#include "video_decoder.h"
 
 using std::string;
 using std::pair;
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 8def5550a..ff10b7d91 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -20,11 +20,11 @@
 #include <list>
 #include <wx/graphics.h>
 #include <boost/weak_ptr.hpp>
-#include "film.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
 #include "film_editor.h"
 #include "timeline.h"
 #include "wx_util.h"
-#include "lib/playlist.h"
 
 using std::list;
 using std::cout;
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 0470ed7b9..6979d6a78 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -21,8 +21,8 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
-#include "util.h"
-#include "rect.h"
+#include "lib/util.h"
+#include "lib/rect.h"
 
 class Film;
 class View;
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 35d5eec21..9493d0acb 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -19,10 +19,10 @@
 
 #include <list>
 #include <wx/graphics.h>
+#include "lib/playlist.h"
 #include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
-#include "playlist.h"
 
 using std::list;
 using std::cout;
diff --git a/src/wx/wscript b/src/wx/wscript
index 0ec4be0cd..9dea367c9 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -57,8 +57,8 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name   = 'libdcpomatic-wx'
-    obj.includes = [ '..' ]
-    obj.export_includes = ['.']
+#    obj.includes = [ '..' ]
+    obj.export_includes = ['..']
     obj.uselib = 'WXWIDGETS'
     if bld.env.TARGET_LINUX:
         obj.uselib += ' GTK'
diff --git a/src/wx/wx_ui_signaller.h b/src/wx/wx_ui_signaller.h
index d134d2b6d..f7df6fca4 100644
--- a/src/wx/wx_ui_signaller.h
+++ b/src/wx/wx_ui_signaller.h
@@ -17,7 +17,7 @@
 
 */
 
-#include "ui_signaller.h"
+#include "lib/ui_signaller.h"
 
 class wxEvtHandler;
 
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 64418dac0..d87fe1149 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -24,9 +24,9 @@
 #include <boost/thread.hpp>
 #include <wx/filepicker.h>
 #include <wx/spinctrl.h>
+#include "lib/config.h"
+#include "lib/util.h"
 #include "wx_util.h"
-#include "config.h"
-#include "util.h"
 
 using namespace std;
 using namespace boost;