[evolution] Rename libeutil to libevolution-util.



commit 6c9a3243c9b335cb7e5873b15562263e74293dc2
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun May 26 14:57:43 2013 -0400

    Rename libeutil to libevolution-util.
    
    To make Evolution's shared libraries more consistent.
    
    Also rename the documentation module to evolution-util.

 addressbook/gui/contact-editor/Makefile.am         |    2 +-
 addressbook/gui/contact-list-editor/Makefile.am    |    2 +-
 addressbook/gui/widgets/Makefile.am                |    2 +-
 addressbook/importers/Makefile.am                  |    2 +-
 addressbook/printing/Makefile.am                   |    4 +-
 addressbook/util/Makefile.am                       |    2 +-
 calendar/alarm-notify/Makefile.am                  |    2 +-
 calendar/gui/Makefile.am                           |    2 +-
 calendar/importers/Makefile.am                     |    2 +-
 composer/Makefile.am                               |    2 +-
 configure.ac                                       |    2 +-
 doc/reference/Makefile.am                          |    2 +-
 .../{libeutil => evolution-util}/Makefile.am       |    6 ++--
 .../evolution-util-docs.sgml}                      |   13 +++++----
 .../evolution-util-overrides.txt}                  |    0
 .../evolution-util-sections.txt}                   |    0
 .../evolution-util.types}                          |    0
 doc/reference/libeshell/Makefile.am                |    2 +-
 e-util/Makefile.am                                 |   26 ++++++++++----------
 em-format/Makefile.am                              |    2 +-
 evolution-plugin.pc.in                             |    2 +-
 evolution-shell.pc.in                              |    2 +-
 libemail-engine/Makefile.am                        |    2 +-
 mail/Makefile.am                                   |    2 +-
 mail/importers/Makefile.am                         |    2 +-
 maint/Makefile.am                                  |    2 +-
 modules/addressbook/Makefile.am                    |    2 +-
 modules/audio-inline/Makefile.am                   |    2 +-
 modules/backup-restore/Makefile.am                 |    4 +-
 modules/bogofilter/Makefile.am                     |    4 +-
 modules/book-config-google/Makefile.am             |    2 +-
 modules/book-config-ldap/Makefile.am               |    2 +-
 modules/book-config-local/Makefile.am              |    2 +-
 modules/book-config-webdav/Makefile.am             |    2 +-
 modules/cal-config-caldav/Makefile.am              |    2 +-
 modules/cal-config-contacts/Makefile.am            |    2 +-
 modules/cal-config-google/Makefile.am              |    2 +-
 modules/cal-config-local/Makefile.am               |    2 +-
 modules/cal-config-weather/Makefile.am             |    2 +-
 modules/cal-config-webcal/Makefile.am              |    2 +-
 modules/calendar/Makefile.am                       |    2 +-
 modules/composer-autosave/Makefile.am              |    2 +-
 modules/contact-photos/Makefile.am                 |    2 +-
 modules/gravatar/Makefile.am                       |    2 +-
 modules/itip-formatter/Makefile.am                 |    2 +-
 modules/itip-formatter/plugin/Makefile.am          |    2 +-
 modules/mail-config/Makefile.am                    |    2 +-
 modules/mail/Makefile.am                           |    2 +-
 modules/mailto-handler/Makefile.am                 |    2 +-
 modules/mdn/Makefile.am                            |    2 +-
 modules/offline-alert/Makefile.am                  |    2 +-
 modules/plugin-lib/Makefile.am                     |    2 +-
 modules/plugin-manager/Makefile.am                 |    2 +-
 modules/prefer-plain/Makefile.am                   |    2 +-
 modules/settings/Makefile.am                       |    2 +-
 modules/spamassassin/Makefile.am                   |    2 +-
 modules/startup-wizard/Makefile.am                 |    2 +-
 modules/text-highlight/Makefile.am                 |    2 +-
 modules/tnef-attachment/Makefile.am                |    4 +-
 modules/web-inspector/Makefile.am                  |    2 +-
 plugins/attachment-reminder/Makefile.am            |    2 +-
 plugins/bbdb/Makefile.am                           |    4 +-
 plugins/dbx-import/Makefile.am                     |    4 +-
 plugins/email-custom-header/Makefile.am            |    2 +-
 plugins/external-editor/Makefile.am                |    4 +-
 plugins/face/Makefile.am                           |    2 +-
 plugins/mail-notification/Makefile.am              |    4 +-
 plugins/mail-to-task/Makefile.am                   |    2 +-
 plugins/mailing-list-actions/Makefile.am           |    2 +-
 plugins/pst-import/Makefile.am                     |    4 +-
 plugins/publish-calendar/Makefile.am               |    2 +-
 plugins/save-calendar/Makefile.am                  |    2 +-
 plugins/templates/Makefile.am                      |    2 +-
 shell/Makefile.am                                  |    4 +-
 smime/gui/Makefile.am                              |    2 +-
 smime/lib/Makefile.am                              |    2 +-
 smime/tests/Makefile.am                            |    2 +-
 77 files changed, 104 insertions(+), 103 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 7664e3d..5307298 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -26,7 +26,7 @@ libecontacteditor_la_SOURCES =                        \
 libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libecontacteditor_la_LIBADD =                                          \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/addressbook/util/libeabutil.la                  \
        $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la        \
        $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la    \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index e73b895..8ccbdc6 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -24,7 +24,7 @@ libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 libecontactlisteditor_la_LIBADD =                              \
        $(top_builddir)/addressbook/util/libeabutil.la          \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 79652c4..0c54ae5 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -74,7 +74,7 @@ libeabwidgets_la_SOURCES =                    \
 
 libeabwidgets_la_LIBADD =                                      \
        $(top_builddir)/shell/libeshell.la                      \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/addressbook/util/libeabutil.la          \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 6345d29..ccaa202 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -21,7 +21,7 @@ libevolution_addressbook_importers_la_SOURCES = \
 libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_addressbook_importers_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/shell/libeshell.la                              \
        $(top_builddir)/addressbook/util/libeabutil.la                  \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index d03938f..eeb80af 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -23,7 +23,7 @@ libecontactprint_la_SOURCES =                         \
        e-contact-print.h
 
 libecontactprint_la_LIBADD =                                   \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/addressbook/util/libeabutil.la          \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
@@ -46,7 +46,7 @@ contact_print_test_LDADD =    \
        libecontactprint.la                                     \
        $(top_builddir)/addressbook/util/libeabutil.la          \
        $(top_builddir)/shell/libeshell.la                      \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)
 
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 83bf1e7..98e9fe1 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -22,7 +22,7 @@ libeabutil_la_SOURCES =                                       \
 libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeabutil_la_LIBADD =                                 \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(CAMEL_LIBS)                                   \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am
index c7446c0..fb257b3 100644
--- a/calendar/alarm-notify/Makefile.am
+++ b/calendar/alarm-notify/Makefile.am
@@ -42,7 +42,7 @@ evolution_alarm_notify_SOURCES =      \
        util.h
 
 evolution_alarm_notify_LDADD =                                         \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/composer/libcomposer.la                         \
        $(top_builddir)/calendar/gui/libevolution-calendar.la           \
        $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b2947d2..591444a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -206,7 +206,7 @@ libevolution_calendar_la_LIBADD =                                   \
        $(top_builddir)/shell/libeshell.la                              \
        $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la          \
        $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
        $(GNOME_PLATFORM_LIBS)                                          \
        $(GTKHTML_LIBS)                                                 \
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a6fb303..ae4ae68 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -18,7 +18,7 @@ libevolution_calendar_importers_la_SOURCES = \
 libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_calendar_importers_la_LIBADD =                    \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 8c9425a..69d4260 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -55,7 +55,7 @@ libcomposer_la_SOURCES =                      \
 libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libcomposer_la_LIBADD =                                        \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/em-format/libemformat.la        \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la             \
diff --git a/configure.ac b/configure.ac
index be8a0fb..6f1bb56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1430,7 +1430,7 @@ data/icons/Makefile
 doc/Makefile
 doc/reference/Makefile
 doc/reference/libeshell/Makefile
-doc/reference/libeutil/Makefile
+doc/reference/evolution-util/Makefile
 e-util/Makefile
 em-format/Makefile
 help/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 806e1b0..7e04e12 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libeutil libeshell
+SUBDIRS = evolution-util libeshell
 
 -include $(top_srcdir)/git.mk
diff --git a/doc/reference/libeutil/Makefile.am b/doc/reference/evolution-util/Makefile.am
similarity index 93%
rename from doc/reference/libeutil/Makefile.am
rename to doc/reference/evolution-util/Makefile.am
index 411f0c8..a7055a4 100644
--- a/doc/reference/libeutil/Makefile.am
+++ b/doc/reference/evolution-util/Makefile.am
@@ -1,8 +1,8 @@
 # The name of the module.
-DOC_MODULE = libeutil
+DOC_MODULE = evolution-util
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libeutil-docs.sgml
+DOC_MAIN_SGML_FILE = evolution-util-docs.sgml
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
@@ -56,7 +56,7 @@ GTKDOC_CFLAGS  =                                      \
        $(NULL)
 
 GTKDOC_LIBS =                                          \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
        $(GTKHTML_LIBS)                                 \
diff --git a/doc/reference/libeutil/libeutil-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml
similarity index 96%
rename from doc/reference/libeutil/libeutil-docs.sgml
rename to doc/reference/evolution-util/evolution-util-docs.sgml
index 0928cda..b19e00c 100644
--- a/doc/reference/libeutil/libeutil-docs.sgml
+++ b/doc/reference/evolution-util/evolution-util-docs.sgml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+<book id="index">
   <bookinfo>
     <title>Evolution Utilities Reference Manual</title>
     <releaseinfo>
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" 
url="http://library.gnome.org/devel/libeutil/";>http://library.gnome.org/devel/libeutil/</ulink>.
+      <ulink role="online-location" 
url="http://developer.gnome.org/evolution-util/";>http://developer.gnome.org/evolution-util/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -271,7 +272,7 @@
     <xi:include href="xml/e-url-entry.xml"/>
   </chapter>
 
-  <chapter>
+  <chapter id="object-tree">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
   </chapter>
diff --git a/doc/reference/libeutil/libeutil-overrides.txt 
b/doc/reference/evolution-util/evolution-util-overrides.txt
similarity index 100%
rename from doc/reference/libeutil/libeutil-overrides.txt
rename to doc/reference/evolution-util/evolution-util-overrides.txt
diff --git a/doc/reference/libeutil/libeutil-sections.txt 
b/doc/reference/evolution-util/evolution-util-sections.txt
similarity index 100%
rename from doc/reference/libeutil/libeutil-sections.txt
rename to doc/reference/evolution-util/evolution-util-sections.txt
diff --git a/doc/reference/libeutil/libeutil.types b/doc/reference/evolution-util/evolution-util.types
similarity index 100%
rename from doc/reference/libeutil/libeutil.types
rename to doc/reference/evolution-util/evolution-util.types
diff --git a/doc/reference/libeshell/Makefile.am b/doc/reference/libeshell/Makefile.am
index c9afa90..90260b5 100644
--- a/doc/reference/libeshell/Makefile.am
+++ b/doc/reference/libeshell/Makefile.am
@@ -29,7 +29,7 @@ GTKDOC_CFLAGS= \
 GTKDOC_LIBS=                                                           \
        $(top_builddir)/libemail-engine/libemail-engine.la              \
        $(top_builddir)/shell/libeshell.la                              \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
        $(GNOME_PLATFORM_LIBS)                                          \
        $(GTKHTML_LIBS)                                                 \
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 933bdd8..7c032a9 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,6 +1,8 @@
 NULL =
 
-eutilincludedir = $(privincludedir)/e-util
+privsolib_LTLIBRARIES = libevolution-util.la
+
+evolution_util_includedir = $(privincludedir)/e-util
 ecpsdir = $(privdatadir)/ecps
 ruledir = $(privdatadir)
 
@@ -56,8 +58,6 @@ xpm_icons = \
        tree-unexpanded.xpm \
        $(NULL)
 
-privsolib_LTLIBRARIES = libeutil.la
-
 noinst_PROGRAMS = \
        evolution-source-viewer \
        test-calendar \
@@ -72,7 +72,7 @@ noinst_PROGRAMS = \
        test-source-selector \
        $(NULL)
 
-libeutil_la_CPPFLAGS = \
+libevolution_util_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_srcdir) \
        -I$(top_builddir) \
@@ -97,14 +97,14 @@ libeutil_la_CPPFLAGS = \
        -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
        -DEVOLUTION_UIDIR=\""$(uidir)"\" \
        -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-       -DG_LOG_DOMAIN=\"libeutil\" \
+       -DG_LOG_DOMAIN=\"evolution-util\" \
        $(EVOLUTION_DATA_SERVER_CFLAGS) \
        $(GNOME_PLATFORM_CFLAGS) \
        $(GEO_CFLAGS) \
        $(GTKHTML_CFLAGS) \
        $(NULL)
 
-eutilinclude_HEADERS =  \
+evolution_util_include_HEADERS =  \
        e-util.h \
        e-action-combo-box.h \
        e-activity-bar.h \
@@ -353,8 +353,8 @@ PLATFORM_SOURCES = \
        $(NULL)
 endif
 
-libeutil_la_SOURCES = \
-       $(eutilinclude_HEADERS) \
+libevolution_util_la_SOURCES = \
+       $(evolution_util_include_HEADERS) \
        e-action-combo-box.c \
        e-activity-bar.c \
        e-activity-proxy.c \
@@ -590,9 +590,9 @@ libeutil_la_SOURCES = \
        $(PLATFORM_SOURCES) \
        $(NULL)
 
-libeutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
-libeutil_la_LIBADD =  \
+libevolution_util_la_LIBADD =  \
        $(top_builddir)/libgnomecanvas/libgnomecanvas.la \
        $(ICONV_LIBS) \
        $(EVOLUTION_DATA_SERVER_LIBS) \
@@ -604,12 +604,12 @@ libeutil_la_LIBADD =  \
        $(NULL)
 
 TEST_CPPFLAGS = \
-       $(libeutil_la_CPPFLAGS) \
+       $(libevolution_util_la_CPPFLAGS) \
        $(NULL)
 
 TEST_LDADD = \
-       libeutil.la \
-       $(libeutil_la_LIBADD) \
+       libevolution-util.la \
+       $(libevolution_util_la_LIBADD) \
        $(NULL)
 
 evolution_source_viewer_CPPFLAGS = $(TEST_CPPFLAGS)
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index d3861a6..36a747d 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -109,7 +109,7 @@ SMIME_LIBS =                                                \
 endif
 
 libemformat_la_LIBADD =                                        \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/libemail-engine/libemail-engine.la \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in
index 1eca893..c93231c 100644
--- a/evolution-plugin.pc.in
+++ b/evolution-plugin.pc.in
@@ -16,5 +16,5 @@ Name: evolution-plugin
 Description: libraries needed for Evolution plugin development
 Version: @VERSION@
 Requires: camel-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0 webkitgtk-3.0
-Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
+Libs: -L${privlibdir} -levolution-util -Wl,-R${privlibdir}
 Cflags: -I${privincludedir}
diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in
index a7ba6e2..b987baf 100644
--- a/evolution-shell.pc.in
+++ b/evolution-shell.pc.in
@@ -19,5 +19,5 @@ Description: libraries needed for Evolution shell components
 Version: @VERSION@
 Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 libgtkhtml-4.0 gtkhtml-editor-4.0
 Requires.private: gnome-desktop-3.0
-Libs: -L${privlibdir} -leshell -leutil -Wl,-R${privlibdir}
+Libs: -L${privlibdir} -leshell -levolution-util -Wl,-R${privlibdir}
 Cflags: -I${privincludedir}
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 649d298..364e3a8 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -75,7 +75,7 @@ libemail_engine_la_SOURCES =  \
        $(NULL)
 
 libemail_engine_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la \
+       $(top_builddir)/e-util/libevolution-util.la \
        $(EVOLUTION_DATA_SERVER_LIBS) \
        $(GNOME_PLATFORM_LIBS) \
        $(GTKHTML_LIBS) \
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c0fdeb3..77ab040 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -191,7 +191,7 @@ endif
 
 libevolution_mail_la_LIBADD =                          \
        $(top_builddir)/libemail-engine/libemail-engine.la              \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/composer/libcomposer.la         \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 339bbe2..69a4277 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -21,7 +21,7 @@ libevolution_mail_importers_la_SOURCES =      \
 libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_mail_importers_la_LIBADD =                                \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/shell/libeshell.la                      \
diff --git a/maint/Makefile.am b/maint/Makefile.am
index e53a1d7..9470343 100644
--- a/maint/Makefile.am
+++ b/maint/Makefile.am
@@ -12,7 +12,7 @@ libgladeevolution_la_LDFLAGS = \
        -module -avoid-version
 
 libgladeevolution_la_LIBADD = \
-       $(top_srcdir)/e-util/libeutil.la \
+       $(top_srcdir)/e-util/libevolution-util.la \
        $(top_srcdir)/mail/libevolution-mail.la \
        $(top_srcdir)/calendar/gui/libevolution-calendar.la \
        $(EVOLUTION_DATA_SERVER_LIBS) \
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index be923f7..1438b50 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -51,7 +51,7 @@ endif
 
 module_addressbook_la_LIBADD = \
        $(SMIME_LIB)                                            \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/composer/libcomposer.la                 \
        $(top_builddir)/addressbook/printing/libecontactprint.la \
        $(top_builddir)/shell/libeshell.la                      \
diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am
index ad75a62..c8ce6f3 100644
--- a/modules/audio-inline/Makefile.am
+++ b/modules/audio-inline/Makefile.am
@@ -20,7 +20,7 @@ module_audio_inline_la_SOURCES =                              \
        evolution-module-audio-inline.c
 
 module_audio_inline_la_LIBADD =                                \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/mail/libevolution-mail.la                       \
        $(top_builddir)/em-format/libemformat.la                        \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am
index 06312e5..4ddfff3 100644
--- a/modules/backup-restore/Makefile.am
+++ b/modules/backup-restore/Makefile.am
@@ -26,7 +26,7 @@ module_backup_restore_la_SOURCES = \
        $(NULL)
 
 module_backup_restore_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/libemail-engine/libemail-engine.la      \
@@ -60,7 +60,7 @@ evolution_backup_SOURCES =                                    \
        $(NULL)
 
 evolution_backup_LDADD =                                       \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index a3e3019..778a5f7 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -12,9 +12,9 @@ module_bogofilter_la_SOURCES = \
        evolution-bogofilter.c
 
 module_bogofilter_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/mail/libevolution-mail.la               \
-       $(top_builddir)/libemail-engine/libemail-engine.la \
+       $(top_builddir)/libemail-engine/libemail-engine.la      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am
index ae9d436..387af00 100644
--- a/modules/book-config-google/Makefile.am
+++ b/modules/book-config-google/Makefile.am
@@ -12,7 +12,7 @@ module_book_config_google_la_SOURCES = \
        evolution-book-config-google.c
 
 module_book_config_google_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index 732e5fc..16086ca 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -15,7 +15,7 @@ module_book_config_ldap_la_SOURCES = \
        e-source-ldap.h
 
 module_book_config_ldap_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am
index e653ee0..392582f 100644
--- a/modules/book-config-local/Makefile.am
+++ b/modules/book-config-local/Makefile.am
@@ -12,7 +12,7 @@ module_book_config_local_la_SOURCES = \
        evolution-book-config-local.c
 
 module_book_config_local_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am
index 9f968a8..8124b9b 100644
--- a/modules/book-config-webdav/Makefile.am
+++ b/modules/book-config-webdav/Makefile.am
@@ -12,7 +12,7 @@ module_book_config_webdav_la_SOURCES = \
        evolution-book-config-webdav.c
 
 module_book_config_webdav_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am
index f7d856b..2a5133f 100644
--- a/modules/cal-config-caldav/Makefile.am
+++ b/modules/cal-config-caldav/Makefile.am
@@ -17,7 +17,7 @@ module_cal_config_caldav_la_SOURCES = \
        e-caldav-chooser-dialog.h
 
 module_cal_config_caldav_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 90fd727..6ece84f 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -16,7 +16,7 @@ module_cal_config_contacts_la_SOURCES = \
        e-source-contacts.h
 
 module_cal_config_contacts_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am
index 2fb6829..b8c380a 100644
--- a/modules/cal-config-google/Makefile.am
+++ b/modules/cal-config-google/Makefile.am
@@ -19,7 +19,7 @@ module_cal_config_google_la_SOURCES = \
        e-google-chooser.h
 
 module_cal_config_google_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index fc423ae..9fd3f43 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -14,7 +14,7 @@ module_cal_config_local_la_SOURCES = \
        e-source-local.h
 
 module_cal_config_local_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index 8eddab8..53d8824 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -15,7 +15,7 @@ module_cal_config_weather_la_SOURCES = \
        e-source-weather.h
 
 module_cal_config_weather_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am
index 1aeaac2..f517183 100644
--- a/modules/cal-config-webcal/Makefile.am
+++ b/modules/cal-config-webcal/Makefile.am
@@ -12,7 +12,7 @@ module_cal_config_webcal_la_SOURCES = \
        evolution-cal-config-webcal.c
 
 module_cal_config_webcal_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 540d61a..ad38b12 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -73,7 +73,7 @@ module_calendar_la_LIBADD = \
        $(top_builddir)/mail/libevolution-mail.la \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la     \
        $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
        $(GNOME_PLATFORM_LIBS)                                          \
        $(GTKHTML_LIBS)
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 1a3b166..08b263a 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -18,7 +18,7 @@ module_composer_autosave_la_SOURCES = \
 module_composer_autosave_la_LIBADD = \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/composer/libcomposer.la                 \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/contact-photos/Makefile.am b/modules/contact-photos/Makefile.am
index 83b9344..d25aac8 100644
--- a/modules/contact-photos/Makefile.am
+++ b/modules/contact-photos/Makefile.am
@@ -18,7 +18,7 @@ module_contact_photos_la_SOURCES = \
        $(NULL)
 
 module_contact_photos_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/gravatar/Makefile.am b/modules/gravatar/Makefile.am
index 47c9e65..fe29264 100644
--- a/modules/gravatar/Makefile.am
+++ b/modules/gravatar/Makefile.am
@@ -18,7 +18,7 @@ module_gravatar_la_SOURCES = \
        $(NULL)
 
 module_gravatar_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)                                         \
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index 240e09f..0b4d7e9 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -29,7 +29,7 @@ module_itip_formatter_la_SOURCES =                                    \
        evolution-module-itip-formatter.c
 
 module_itip_formatter_la_LIBADD =                                      \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/calendar/gui/libevolution-calendar.la           \
        $(top_builddir)/mail/libevolution-mail.la                       \
        $(top_builddir)/shell/libeshell.la                              \
diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am
index 8de54f1..648d3f3 100644
--- a/modules/itip-formatter/plugin/Makefile.am
+++ b/modules/itip-formatter/plugin/Makefile.am
@@ -22,7 +22,7 @@ liborg_gnome_itip_formatter_la_SOURCES =              \
 liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_itip_formatter_la_LIBADD =                                \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/calendar/gui/libevolution-calendar.la   \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/shell/libeshell.la                      \
diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am
index 49c8d24..2d6eb41 100644
--- a/modules/mail-config/Makefile.am
+++ b/modules/mail-config/Makefile.am
@@ -26,7 +26,7 @@ module_mail_config_la_SOURCES = \
        $(NULL)
 
 module_mail_config_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/libemail-engine/libemail-engine.la      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index a488ba2..14bbf9b 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -42,7 +42,7 @@ module_mail_la_SOURCES = \
 
 module_mail_la_LIBADD = \
        $(top_builddir)/libemail-engine/libemail-engine.la              \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/em-format/libemformat.la                        \
        $(top_builddir)/shell/libeshell.la                              \
        $(top_builddir)/composer/libcomposer.la                         \
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index e33a120..92ccb91 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -12,7 +12,7 @@ module_mailto_handler_la_SOURCES = \
        evolution-mailto-handler.c
 
 module_mailto_handler_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am
index f185bcb..51fc488 100644
--- a/modules/mdn/Makefile.am
+++ b/modules/mdn/Makefile.am
@@ -14,7 +14,7 @@ module_mdn_la_SOURCES = \
 module_mdn_la_LIBADD = \
        $(top_builddir)/libemail-engine/libemail-engine.la      \
        $(top_builddir)/mail/libevolution-mail.la               \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index 355b2dc..5c7b42e 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -12,7 +12,7 @@ module_offline_alert_la_SOURCES = \
        evolution-offline-alert.c
 
 module_offline_alert_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index 931ccaf..c7d97b9 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -15,7 +15,7 @@ module_plugin_lib_la_SOURCES = \
        e-plugin-lib.h
 
 module_plugin_lib_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index c32a689..121480b 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -12,7 +12,7 @@ module_plugin_manager_la_SOURCES = \
        evolution-plugin-manager.c
 
 module_plugin_manager_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am
index 8b42447..2b241e4 100644
--- a/modules/prefer-plain/Makefile.am
+++ b/modules/prefer-plain/Makefile.am
@@ -19,7 +19,7 @@ module_prefer_plain_la_SOURCES =                              \
        evolution-module-prefer-plain.c
 
 module_prefer_plain_la_LIBADD =                                \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/mail/libevolution-mail.la                       \
        $(top_builddir)/em-format/libemformat.la                        \
        $(top_builddir)/shell/libeshell.la                              \
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index e8e66b2..523c4c3 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -48,7 +48,7 @@ module_settings_la_SOURCES = \
        $(NULL)
 
 module_settings_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la \
+       $(top_builddir)/e-util/libevolution-util.la \
        $(top_builddir)/em-format/libemformat.la \
        $(top_builddir)/shell/libeshell.la \
        $(top_builddir)/mail/libevolution-mail.la \
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index d5ceb2a..5dd66d8 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -12,7 +12,7 @@ module_spamassassin_la_SOURCES = \
        evolution-spamassassin.c
 
 module_spamassassin_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/libemail-engine/libemail-engine.la \
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 5af7507..728ab86 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -22,7 +22,7 @@ module_startup_wizard_la_SOURCES = \
        $(NULL)
 
 module_startup_wizard_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/calendar/gui/libevolution-calendar.la   \
        $(top_builddir)/mail/libevolution-mail.la               \
diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am
index 182364a..44d3224 100644
--- a/modules/text-highlight/Makefile.am
+++ b/modules/text-highlight/Makefile.am
@@ -21,7 +21,7 @@ module_text_highlight_la_SOURCES =                                    \
        languages.h
 
 module_text_highlight_la_LIBADD =                                      \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/mail/libevolution-mail.la                       \
        $(top_builddir)/em-format/libemformat.la                        \
        $(top_builddir)/shell/libeshell.la                              \
diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am
index 03ccc26..fd91217 100644
--- a/modules/tnef-attachment/Makefile.am
+++ b/modules/tnef-attachment/Makefile.am
@@ -1,6 +1,6 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =                           \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/mail/libevolution-mail.la
 endif
 
@@ -22,7 +22,7 @@ module_tnef_attachment_la_SOURCES =                   \
        evolution-module-tnef-attachment.c
 
 module_tnef_attachment_la_LIBADD =                             \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/em-format/libemformat.la                        \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
        $(GNOME_PLATFORM_LIBS)                                          \
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index 229d826..985e483 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -12,7 +12,7 @@ module_web_inspector_la_SOURCES = \
        evolution-web-inspector.c
 
 module_web_inspector_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
        $(GTKHTML_LIBS)
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 74bb88b..1b66828 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -27,7 +27,7 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD =        \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
        $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la    \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/mail/libevolution-mail.la       \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index b5f6fc8..38cfe0a 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -1,7 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =                           \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(GNOME_PLATFORM_LIBS)
 endif
 
@@ -24,7 +24,7 @@ liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_evolution_bbdb_la_LIBADD =                \
-       $(top_builddir)/e-util/libeutil.la      \
+       $(top_builddir)/e-util/libevolution-util.la \
        $(top_builddir)/shell/libeshell.la      \
        $(top_builddir)/composer/libcomposer.la \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index 86c0602..e44d216 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -1,7 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =                           \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/e-util/libeutil.la
+       $(top_builddir)/e-util/libevolution-util.la
 endif
 
 @EVO_PLUGIN_RULE@
@@ -24,7 +24,7 @@ liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_dbx_import_la_LIBADD =                    \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/libemail-engine/libemail-engine.la \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 4a457f2..8c5f059 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -19,7 +19,7 @@ liborg_gnome_email_custom_header_la_SOURCES =                 \
        email-custom-header.h
 
 liborg_gnome_email_custom_header_la_LIBADD =                   \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/composer/libcomposer.la                 \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 689f993..5fe2b09 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,7 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = \
        $(GNOME_PLATFORM_LIBS) \
-       $(top_builddir)/e-util/libeutil.la \
+       $(top_builddir)/e-util/libevoluiton-util.la \
        $(top_builddir)/mail/libevolution-mail.la
 endif
 
@@ -36,7 +36,7 @@ liborg_gnome_external_editor_la_SOURCES =             \
 liborg_gnome_external_editor_la_LDFLAGS = \
        -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_external_editor_la_LIBADD =                       \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/composer/libcomposer.la                 \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la             \
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 6308799..207456a 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -17,7 +17,7 @@ liborg_gnome_face_la_CPPFLAGS =                               \
 liborg_gnome_face_la_SOURCES = face.c
 
 liborg_gnome_face_la_LIBADD =                                  \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/composer/libcomposer.la                 \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 02425f9..fbb2cd0 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,7 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =                           \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(GNOME_PLATFORM_LIBS)
 endif
 
@@ -25,7 +25,7 @@ liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_mail_notification_la_LIBADD =                     \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/mail/libevolution-mail.la               \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/libemail-engine/libemail-engine.la      \
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index a9786fc..3ef65c6 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -16,7 +16,7 @@ liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_mail_to_task_la_LIBADD =  \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(top_builddir)/shell/libeshell.la                              \
        $(top_builddir)/em-format/libemformat.la                        \
        $(top_builddir)/calendar/gui/libevolution-calendar.la           \
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 769b328..ba32b5a 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -16,7 +16,7 @@ liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
 liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_mailing_list_actions_la_LIBADD =          \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/composer/libcomposer.la         \
        $(top_builddir)/mail/libevolution-mail.la       \
        $(top_builddir)/shell/libeshell.la              \
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 134d039..b8a5770 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,7 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =                           \
        $(top_builddir)/mail/libevolution-mail.la       \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(EVOLUTION_MAIL_LIBS)
 endif
 
@@ -27,7 +27,7 @@ liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_pst_import_la_LIBADD =                            \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/mail/libevolution-mail.la               \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/libemail-engine/libemail-engine.la      \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
        $(GNOME_PLATFORM_LIBS)                                  \
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index e8192b6..22d760b 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -33,7 +33,7 @@ liborg_gnome_publish_calendar_la_SOURCES =    \
 liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_publish_calendar_la_LIBADD =                      \
-       $(top_builddir)/e-util/libeutil.la                      \
+       $(top_builddir)/e-util/libevolution-util.la             \
        $(top_builddir)/shell/libeshell.la                      \
        $(top_builddir)/calendar/gui/libevolution-calendar.la   \
        $(EVOLUTION_DATA_SERVER_LIBS)                           \
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 833d920..3aee9fc 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -20,7 +20,7 @@ liborg_gnome_save_calendar_la_SOURCES = \
 
 liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_save_calendar_la_LIBADD = \
-       $(top_builddir)/e-util/libeutil.la      \
+       $(top_builddir)/e-util/libevolution-util.la \
        $(top_builddir)/shell/libeshell.la      \
        $(EVOLUTION_DATA_SERVER_LIBS)           \
        $(GNOME_PLATFORM_LIBS)                  \
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index b28632f..5e6c5ad 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -18,7 +18,7 @@ liborg_gnome_templates_la_SOURCES = templates.c
 liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_templates_la_LIBADD =     \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/composer/libcomposer.la         \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/mail/libevolution-mail.la       \
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 92bfe49..f24e88f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -88,7 +88,7 @@ libeshell_la_SOURCES =                                \
 libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeshell_la_LIBADD =                                  \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
        $(CLUTTER_GTK_LIBS)
@@ -131,7 +131,7 @@ evolution_SOURCES =                         \
 
 evolution_LDADD =                                                      \
        libeshell.la                                                    \
-       $(top_builddir)/e-util/libeutil.la                              \
+       $(top_builddir)/e-util/libevolution-util.la                     \
        $(EVOLUTION_DATA_SERVER_LIBS)                                   \
        $(GNOME_PLATFORM_LIBS)                                          \
        $(CLUTTER_GTK_LIBS)                                             \
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 1a867d5..5d35218 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -36,7 +36,7 @@ libevolution_smime_la_SOURCES =       \
 
 
 libevolution_smime_la_LIBADD =                         \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/shell/libeshell.la              \
        $(top_builddir)/smime/lib/libessmime.la         \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 634c982..a8e2bfb 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -30,7 +30,7 @@ libessmime_la_SOURCES =       \
        e-pkcs12.h
 
 libessmime_la_LIBADD =                         \
-       $(top_builddir)/e-util/libeutil.la      \
+       $(top_builddir)/e-util/libevolution-util.la \
        $(EVOLUTION_DATA_SERVER_LIBS)           \
        $(GNOME_PLATFORM_LIBS)                  \
        $(GTKHTML_LIBS)                         \
diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am
index be4cea3..211042d 100644
--- a/smime/tests/Makefile.am
+++ b/smime/tests/Makefile.am
@@ -11,7 +11,7 @@ TEST_LIBS= \
        $(top_builddir)/smime/lib/libessmime.la         \
        -L/home/toshok/src/mozilla/mozilla/dist/lib     \
        $(CERT_UI_LIBS)                                 \
-       $(top_builddir)/e-util/libeutil.la              \
+       $(top_builddir)/e-util/libevolution-util.la     \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]