[dasher: 147/217] Fix the linux build by moving the FileUtils.cc to a different library\nRemove the <codecvt> header f

[Patrick Welche <pwelche src gnome org>]

commit 88d3a514187a32447a3a3b73f429679a2fde114a
Author: lbaudoin <lbaudoin google com>
Date:   Tue Dec 15 19:34:04 2015 -0700

    Fix the linux build by moving the FileUtils.cc to a different library\nRemove the <codecvt> header for 
older versions of GCC

 Src/DasherCore/XmlSettingsStore.cpp |    2 --
 Src/Gtk2/Makefile.am                |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/Src/DasherCore/XmlSettingsStore.cpp b/Src/DasherCore/XmlSettingsStore.cpp
index e4953ab..e545e65 100644
--- a/Src/DasherCore/XmlSettingsStore.cpp
+++ b/Src/DasherCore/XmlSettingsStore.cpp
@@ -4,8 +4,6 @@
 #include <fstream>
 #include <string.h>
 #include <algorithm>
-#include <locale>
-#include <codecvt>
 
 #if defined(_WIN32) || defined(_WIN64) 
 #include "WinUTF8.h"
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index bd71e03..8b7a900 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -30,6 +30,8 @@ libdashercontrol_la_SOURCES = \
                Canvas.h \
                DasherControl.cpp \
                DasherControl.h \
+               FileUtils.h \
+               FileUtils.cpp \
                GnomeSettingsStore.h \
                GtkDasherControl.cpp \
                GtkDasherControl.h \
@@ -76,8 +78,6 @@ libdashergtk_la_SOURCES = \
                dasher_lock_dialogue.h \
                dasher_main.cpp \
                dasher_main.h \
-               FileUtils.h \
-               FileUtils.cpp \
                module_settings_window.cpp \
                module_settings_window.h