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.

12 files changed, 3 insertions, 42 deletions

diff --git a/composer/Makefile.am b/composer/Makefile.am
index 59b316097d..d5df64095f 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -27,10 +27,6 @@ libcomposer_la_CPPFLAGS =						\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/composer					\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_builddir)/widgets					\
-	-I$(top_srcdir)/widgets/misc					\
-	-I$(top_builddir)/widgets/misc					\
 	-I$(top_builddir)/shell						\
 	-I$(top_srcdir)/shell						\
 	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
@@ -40,6 +36,7 @@ libcomposer_la_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"composer\"					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
+	$(CHAMPLAIN_CFLAGS)						\
 	$(GTKHTML_CFLAGS)
 
 libcomposer_la_SOURCES = 			\
@@ -60,15 +57,13 @@ libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libcomposer_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(top_builddir)/libemail-utils/libemail-utils.la \
-	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
+	$(CHAMPLAIN_CFLAGS)				\
 	$(GTKHTML_LIBS)
 
 ui_DATA = evolution-composer.ui
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 966866b830..1317775364 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -25,7 +25,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <libevolution-utils/e-alert-dialog.h>
 
 static void
 action_attach_cb (GtkAction *action,
diff --git a/composer/e-composer-activity.h b/composer/e-composer-activity.h
index 431e390062..a437e06e03 100644
--- a/composer/e-composer-activity.h
+++ b/composer/e-composer-activity.h
@@ -19,7 +19,6 @@
 #ifndef E_COMPOSER_ACTIVITY_H
 #define E_COMPOSER_ACTIVITY_H
 
-#include <e-util/e-activity.h>
 #include <composer/e-msg-composer.h>
 
 /* Standard GObject macros */
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 661797eee6..b58a138373 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -22,5 +22,6 @@
 #define E_COMPOSER_COMMON
 
 #include <gtk/gtk.h>
+#include <e-util/e-util.h>
 
 #endif /* E_COMPOSER_COMMON */
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index ceecd68b87..d9afb5985a 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -24,8 +24,6 @@
 
 #include "e-composer-from-header.h"
 
-#include <misc/e-mail-identity-combo-box.h>
-
 G_DEFINE_TYPE (
 	EComposerFromHeader,
 	e_composer_from_header,
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 72c8dacaa8..2760ba50ee 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -22,10 +22,8 @@
 #include "e-composer-header-table.h"
 
 #include <glib/gi18n-lib.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell.h>
-#include <misc/e-mail-signature-combo-box.h>
 
 #include "e-msg-composer.h"
 #include "e-composer-private.h"
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 3e7e16c527..f459aaeae8 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -22,7 +22,6 @@
 
 #include <shell/e-shell.h>
 #include <composer/e-composer-header.h>
-#include <misc/e-mail-signature-combo-box.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_HEADER_TABLE \
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index b745941a3e..5632ddf0c0 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -19,7 +19,6 @@
 #define E_COMPOSER_NAME_HEADER_H
 
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include <composer/e-composer-header.h>
 
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 4370b1a12b..fc358b9320 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -35,24 +35,6 @@
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
 #include "e-composer-header-table.h"
-#include "libevolution-utils/e-alert-sink.h"
-#include "e-util/e-charset.h"
-#include "e-util/e-marshal.h"
-#include "e-util/e-mktemp.h"
-#include "e-util/e-plugin-ui.h"
-#include "e-util/e-selection.h"
-#include "e-util/e-util.h"
-#include "widgets/misc/e-activity-bar.h"
-#include "widgets/misc/e-alert-bar.h"
-#include "widgets/misc/e-attachment.h"
-#include "widgets/misc/e-attachment-icon-view.h"
-#include "widgets/misc/e-attachment-paned.h"
-#include "widgets/misc/e-attachment-store.h"
-#include "widgets/misc/e-mail-signature-combo-box.h"
-#include "widgets/misc/e-picture-gallery.h"
-#include "widgets/misc/e-preferences-window.h"
-#include "widgets/misc/e-web-view-gtkhtml.h"
-#include "shell/e-shell.h"
 
 #ifdef HAVE_XFREE
 #include <X11/XF86keysym.h>
diff --git a/composer/e-composer-spell-header.c b/composer/e-composer-spell-header.c
index ad4ddca6dd..a3c945ded4 100644
--- a/composer/e-composer-spell-header.c
+++ b/composer/e-composer-spell-header.c
@@ -19,8 +19,6 @@
 #include <config.h>
 #endif
 
-#include <misc/e-spell-entry.h>
-
 #include "e-composer-spell-header.h"
 
 G_DEFINE_TYPE (
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5cd9a70f75..dcfd3852e6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -37,10 +37,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 
-#include <libevolution-utils/e-alert-dialog.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-
 #include "e-composer-private.h"
 
 #include <em-format/e-mail-part.h>
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index a85993fd87..941845af70 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -28,9 +28,6 @@
 #include <gtkhtml-editor.h>
 #include <libebook/libebook.h>
 
-#include <misc/e-attachment-view.h>
-#include <misc/e-focus-tracker.h>
-#include <misc/e-web-view-gtkhtml.h>
 #include <shell/e-shell.h>
 
 #include <composer/e-composer-header-table.h>