Consolidate base utility libraries into libeutil.

Evolution consists of entirely too many small utility libraries, which
increases linking and loading time, places a burden on higher layers of
the application (e.g. modules) which has to remember to link to all the
small in-tree utility libraries, and makes it difficult to generate API
documentation for these utility libraries in one Gtk-Doc module.

Merge the following utility libraries under the umbrella of libeutil,
and enforce a single-include policy on libeutil so we can reorganize
the files as desired without disrupting its pseudo-public API.

   libemail-utils/libemail-utils.la
   libevolution-utils/libevolution-utils.la
   filter/libfilter.la
   widgets/e-timezone-dialog/libetimezonedialog.la
   widgets/menus/libmenus.la
   widgets/misc/libemiscwidgets.la
   widgets/table/libetable.la
   widgets/text/libetext.la

This also merges libedataserverui from the Evolution-Data-Server module,
since Evolution is its only consumer nowadays, and I'd like to make some
improvements to those APIs without concern for backward-compatibility.

And finally, start a Gtk-Doc module for libeutil.  It's going to be a
project just getting all the symbols _listed_ much less _documented_.
But the skeletal structure is in place and I'm off to a good start.

6 files changed, 9 insertions, 15 deletions

diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 6d40087a3f..089dae4892 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -5,11 +5,11 @@ libevolution_mail_importers_la_CPPFLAGS = \
 	-I.. 						\
 	-I$(srcdir)/..					\
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
 	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CHAMPLAIN_CFLAGS)				\
 	$(GTKHTML_CFLAGS)
 
 libevolution_mail_importers_la_SOURCES =	\
@@ -24,14 +24,12 @@ libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
-	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
+	$(CHAMPLAIN_LIBS)					\
 	$(GTKHTML_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 02d29f5394..8722a8d561 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -38,9 +38,8 @@
 
 #include "mail-importer.h"
 
-#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
-#include "e-util/e-import.h"
 #include "shell/e-shell.h"
 
 #define d(x)
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 0f1e507f2c..ddbc798374 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -44,17 +44,15 @@
 #include "shell/e-shell-view.h"
 #include "shell/e-shell-sidebar.h"
 
+#include "libemail-engine/mail-mt.h"
+
 #include "mail/e-mail-backend.h"
 #include "mail/em-folder-selection-button.h"
 #include "mail/em-folder-tree-model.h"
 #include "mail/em-folder-tree.h"
-#include "libemail-utils/mail-mt.h"
 
 #include "mail-importer.h"
 
-#include "e-util/e-import.h"
-#include "misc/e-web-view-preview.h"
-
 typedef struct {
 	EImport *import;
 	EImportTarget *target;
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index be821063a6..19df23d03c 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -39,9 +39,9 @@
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
 
-#include "libemail-utils/mail-mt.h"
-#include "libemail-engine/mail-tools.h"
 #include "libemail-engine/e-mail-session.h"
+#include "libemail-engine/mail-mt.h"
+#include "libemail-engine/mail-tools.h"
 
 #include "mail-importer.h"
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index bd0335c299..11e97955d6 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -24,8 +24,8 @@
 #ifndef __MAIL_IMPORTER_H__
 #define __MAIL_IMPORTER_H__
 
-#include <e-util/e-import.h>
 #include <camel/camel.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
 
 EImportImporter *mbox_importer_peek (void);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index c8904c4e0b..eb7e5ade07 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -40,9 +40,8 @@
 
 #include "mail-importer.h"
 
-#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
-#include "e-util/e-import.h"
 #include "shell/e-shell.h"
 
 #define d(x)