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.

7 files changed, 12 insertions, 15 deletions

diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index d4e04f230b..d346bf5594 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -9,8 +9,6 @@ libevolution_smime_la_CPPFLAGS =			\
 	-I$(top_builddir)/smime/lib			\
 	-I$(top_srcdir)/shell				\
 	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_builddir)/widgets			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
@@ -19,6 +17,8 @@ libevolution_smime_la_CPPFLAGS =			\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
 	$(CERT_UI_CFLAGS)
 
 libevolution_smime_la_SOURCES = 	\
@@ -40,10 +40,10 @@ libevolution_smime_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/smime/lib/libessmime.la		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
+	$(CHAMPLAIN_LIBS)				\
+	$(GTKHTML_LIBS)					\
 	$(CERT_UI_LIBS)
 
 libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 109bbba515..55f951e4f9 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -46,10 +46,6 @@
 #include <pk11func.h>
 
 #include "shell/e-shell.h"
-#include "e-util/e-dialog-utils.h"
-#include "e-util/e-util.h"
-#include "e-util/e-util-private.h"
-#include "widgets/misc/e-preferences-window.h"
 
 #define E_CERT_MANAGER_CONFIG_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h
index 0f74d30694..0b873f81da 100644
--- a/smime/gui/certificate-manager.h
+++ b/smime/gui/certificate-manager.h
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <shell/e-shell.h>
-#include <widgets/misc/e-preferences-window.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CERT_MANAGER_CONFIG \
diff --git a/smime/gui/component.c b/smime/gui/component.c
index bf172194c1..576d890955 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -29,7 +29,8 @@
 #include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
-#include <libedataserverui/libedataserverui.h>
+
+#include "e-util/e-util.h"
 
 #include "ca-trust-dialog.h"
 #include "e-cert-db.h"
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 5ef47070d4..ed052bfca9 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -14,6 +14,8 @@ libessmime_la_CPPFLAGS =				\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
 	$(CERT_UI_CFLAGS)
 
 libessmime_la_SOURCES = 	\
@@ -29,10 +31,11 @@ libessmime_la_SOURCES = 	\
 	e-pkcs12.h
 
 libessmime_la_LIBADD =				\
-	$(top_builddir)/libemail-utils/libemail-utils.la	\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
+	$(CHAMPLAIN_LIBS)			\
+	$(GTKHTML_LIBS)				\
 	$(CERT_UI_LIBS)
 
 libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index a98d085c43..1a5803fda1 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -48,9 +48,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel.h>        /* FIXME: this is where camel_init is defined; it shouldn't include everything else */
-
-#include <libedataserverui/libedataserverui.h>
+#include <camel/camel.h>
 
 /* private NSS defines used by PSM */
 /* (must be declated before cert.h) */
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index fa61033151..eef6acd32f 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -51,7 +51,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <libedataserverui/libedataserverui.h>
+#include "e-util/e-util.h"
 
 #include "e-cert-db.h"
 #include "e-pkcs12.h"