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.

4 files changed, 5 insertions, 11 deletions

diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 515370d38c..cd509f9eb6 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -7,10 +7,11 @@ libevolution_addressbook_importers_la_CPPFLAGS =	\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 libevolution_addressbook_importers_la_SOURCES = \
 	evolution-ldif-importer.c		\
@@ -24,9 +25,10 @@ libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
+	$(CHAMPLAIN_LIBS)						\
+	$(GTKHTML_LIBS)							\
 	$(IMPORTERS_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 7594ab1cf3..b32f8e1b7b 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -35,10 +35,8 @@
 #include <glib/gstdio.h>
 
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-import.h>
 
 #include "evolution-addressbook-importers.h"
 
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index c95b2f4357..db2bfbf27d 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -42,10 +42,8 @@
 #include <glib/gstdio.h>
 
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-import.h>
 
 #include "evolution-addressbook-importers.h"
 
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index d430bd24eb..5129754501 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -36,14 +36,10 @@
 #include <glib/gstdio.h>
 
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include <util/eab-book-util.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-import.h>
-#include <e-util/e-datetime-format.h>
-#include <misc/e-web-view-preview.h>
 
 #include "evolution-addressbook-importers.h"