Commit d09d8de8 authored by Matthew Barnes's avatar Matthew Barnes
Browse files

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.
parent b61331ed
......@@ -51,13 +51,8 @@ SUBDIRS = \
m4 \
data \
libgnomecanvas \
libevolution-utils \
filter \
libemail-utils \
libemail-engine \
e-util \
a11y \
widgets \
libemail-engine \
shell \
$(SMIME_SUBDIR) \
em-format \
......
# for debug
#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
privsolib_LTLIBRARIES = libevolution-a11y.la
libevolution_a11y_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(A11Y_CFLAGS)
libevolution_a11y_la_SOURCES = \
ea-factory.h \
gal-a11y-util.c \
gal-a11y-util.h \
gal-a11y-factory.h
libevolution_a11y_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
libevolution_a11y_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(GNOME_PLATFORM_LIBS)
-include $(top_srcdir)/git.mk
......@@ -3,16 +3,16 @@ privsolib_LTLIBRARIES = libecontacteditor.la
libecontacteditor_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/widgets/table \
-I$(top_builddir)/shell \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=\"contact-editor\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS)
$(GNOME_PLATFORM_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
libecontacteditor_la_SOURCES = \
eab-editor.c \
......@@ -28,15 +28,15 @@ libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
libecontacteditor_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/addressbook/util/libeabutil.la \
$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/printing/libecontactprint.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
$(GNOME_PLATFORM_LIBS) \
$(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
ui_DATA = \
contact-editor.ui \
......
......@@ -30,23 +30,16 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libedataserverui/libedataserverui.h>
#include "shell/e-shell.h"
#include "addressbook/printing/e-contact-print.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
#include "e-util/e-util.h"
#include "libevolution-utils/e-alert-dialog.h"
#include "misc/e-dateedit.h"
#include "misc/e-image-chooser.h"
#include "misc/e-url-entry.h"
#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
#include "shell/e-shell.h"
#include "eab-contact-merging.h"
......
......@@ -29,13 +29,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libedataserverui/libedataserverui.h>
#include <addressbook/util/eab-book-util.h>
#include "e-contact-editor.h"
#include "e-contact-quick-add.h"
#include "eab-contact-merging.h"
#include "libevolution-utils/e-alert-dialog.h"
typedef struct _QuickAdd QuickAdd;
struct _QuickAdd {
......
......@@ -3,7 +3,6 @@ privsolib_LTLIBRARIES = libecontactlisteditor.la
libecontactlisteditor_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/gui/contact-editor \
......@@ -11,7 +10,9 @@ libecontactlisteditor_la_CPPFLAGS = \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DG_LOG_DOMAIN=\"contact-list-editor\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS)
$(GNOME_PLATFORM_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
libecontactlisteditor_la_SOURCES = \
e-contact-list-editor.c \
......@@ -24,13 +25,12 @@ 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)/widgets/table/libetable.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/libevolution-utils/libevolution-utils.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
$(GNOME_PLATFORM_LIBS) \
$(CHAMPLAIN_LIBS) \
$(GTKHTML_LIBS)
ui_DATA = contact-list-editor.ui
......
......@@ -25,10 +25,6 @@
#endif
#include "e-contact-list-editor.h"
#include <e-util/e-util-private.h>
#include <libevolution-utils/e-alert-dialog.h>
#include <e-util/e-selection.h>
#include "shell/e-shell.h"
#include <string.h>
......@@ -38,7 +34,8 @@
#include <camel/camel.h>
#include "e-util/e-util.h"
#include "shell/e-shell.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
#include "addressbook/util/eab-book-util.h"
......
......@@ -23,8 +23,6 @@
#ifndef __E_CONTACT_LIST_EDITOR_H__
#define __E_CONTACT_LIST_EDITOR_H__
#include <libedataserverui/libedataserverui.h>
#include "addressbook/gui/contact-editor/eab-editor.h"
#define E_TYPE_CONTACT_LIST_EDITOR \
......
......@@ -26,7 +26,6 @@
#include <string.h>
#include "e-contact-list-model.h"
#include "libevolution-utils/e-alert-dialog.h"
#include "shell/e-shell.h"
#define E_CONTACT_LIST_MODEL_GET_PRIVATE(obj) \
......
......@@ -5,10 +5,10 @@ libeabbookmerging_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"eab-contact-merging\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/addressbook \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(CHAMPLAIN_CFLAGS) \
$(GTKHTML_CFLAGS)
libeabbookmerging_la_SOURCES = \
......
......@@ -28,7 +28,7 @@
#include <ctype.h>
#include <string.h>
#include <libedataserverui/libedataserverui.h>
#include "e-util/e-util.h"
#include "addressbook/util/eab-book-util.h"
#include "eab-contact-compare.h"
......
......@@ -12,12 +12,9 @@ libeabwidgets_la_CPPFLAGS = \
-DEVOLUTION_IMAGESDIR=\"${imagesdir}\" \
-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" \
-I$(top_srcdir) \
-I$(top_srcdir)/filter \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/util \
-I$(top_srcdir)/widgets/misc \
-I$(top_builddir)/shell \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
......@@ -69,11 +66,7 @@ libeabwidgets_la_SOURCES = \
ea-addressbook.h
libeabwidgets_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/widgets/table/libetable.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/a11y/libevolution-a11y.la \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
......
......@@ -22,7 +22,8 @@
#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
#include <libebook/libebook.h>
#include <text/e-reflow-model.h>
#include <e-util/e-util.h>
#include "e-addressbook-model.h"
......
......@@ -24,7 +24,7 @@
#include "e-addressbook-selector.h"
#include <e-util/e-selection.h>
#include <e-util/e-util.h>
#include <eab-book-util.h>
#include <eab-contact-merging.h>
......
......@@ -21,8 +21,6 @@
#ifndef E_ADDRESSBOOK_SELECTOR_H
#define E_ADDRESSBOOK_SELECTOR_H
#include <libedataserverui/libedataserverui.h>
#include "e-addressbook-view.h"
/* Standard GObject macros */
......
......@@ -21,7 +21,7 @@
#ifndef _EAB_TABLE_ADAPTER_H_
#define _EAB_TABLE_ADAPTER_H_
#include <table/e-table-model.h>
#include <e-util/e-util.h>
/* Standard GObject macros */
#define E_TYPE_ADDRESSBOOK_TABLE_ADAPTER \
......
......@@ -25,40 +25,29 @@
#include <config.h>
#endif
#include <ctype.h>
#include <string.h>
#include <glib/gi18n.h>
#include <table/e-table.h>
#include <table/e-table-model.h>
#include <table/e-cell-date.h>
#include <misc/e-selectable.h>
#include <widgets/menus/gal-view-factory-etable.h>
#include <filter/e-rule-editor.h>
#include <widgets/menus/gal-view-etable.h>
#include <shell/e-shell-sidebar.h>
#include <gdk/gdkkeysyms.h>
#include "addressbook/printing/e-contact-print.h"
#include "ea-addressbook.h"
#include "e-addressbook-view.h"
#include "e-util/e-print.h"
#include "e-util/e-selection.h"
#include "e-util/e-util.h"
#include "shell/e-shell-sidebar.h"
#include "addressbook/printing/e-contact-print.h"
#include "ea-addressbook.h"
#include "gal-view-minicard.h"
#include "gal-view-factory-minicard.h"
#include "e-addressbook-view.h"
#include "e-addressbook-model.h"
#include "eab-gui-util.h"
#include "util/eab-book-util.h"
#include "e-addressbook-table-adapter.h"
#include "eab-contact-merging.h"
#include "libevolution-utils/e-alert-dialog.h"
#include "e-util/e-util-private.h"
#include <gdk/gdkkeysyms.h>
#include <ctype.h>
#include <string.h>
#define E_ADDRESSBOOK_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate))
......
......@@ -25,10 +25,7 @@
#include <libebook/libebook.h>
#include <menus/gal-view-instance.h>
#include <misc/e-selection-model.h>
#include <shell/e-shell-view.h>
#include <filter/e-filter-rule.h>
#include "e-addressbook-model.h"
#include "eab-contact-display.h"
......
......@@ -27,14 +27,13 @@
#include "e-minicard-label.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include <glib/gi18n.h>
#include <e-util/e-util.h>
#include <text/e-text.h>
#include <misc/e-canvas.h>
#include <misc/e-canvas-utils.h>
#include <gdk/gdkkeysyms.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include "e-util/e-util.h"
static void e_minicard_label_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
static void e_minicard_label_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);
......
......@@ -25,11 +25,10 @@
#endif
#include <gtk/gtk.h>
#include <misc/e-canvas-background.h>
#include <misc/e-canvas.h>
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include <e-util/e-util.h>
#include "e-minicard-view-widget.h"
static void e_minicard_view_widget_set_property
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment