From d09d8de870b6697c8a8b262e7e077b871a69b315 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Dec 2012 08:09:59 -0500 Subject: 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. --- modules/startup-wizard/Makefile.am | 8 ++++---- modules/startup-wizard/e-mail-config-import-page.c | 2 -- modules/startup-wizard/e-mail-config-import-page.h | 2 +- modules/startup-wizard/e-mail-config-import-progress-page.h | 2 -- modules/startup-wizard/e-startup-assistant.c | 2 ++ modules/startup-wizard/evolution-startup-wizard.c | 3 --- 6 files changed, 7 insertions(+), 12 deletions(-) (limited to 'modules/startup-wizard') diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 0642691c49..747b90a7fd 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -5,10 +5,11 @@ module_LTLIBRARIES = module-startup-wizard.la module_startup_wizard_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-startup-wizard\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) module_startup_wizard_la_SOURCES = \ @@ -24,15 +25,14 @@ module_startup_wizard_la_SOURCES = \ module_startup_wizard_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(libevolution_mail_settings_la) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) module_startup_wizard_la_LDFLAGS = \ diff --git a/modules/startup-wizard/e-mail-config-import-page.c b/modules/startup-wizard/e-mail-config-import-page.c index 8d2ad1f2f1..4028fee1fa 100644 --- a/modules/startup-wizard/e-mail-config-import-page.c +++ b/modules/startup-wizard/e-mail-config-import-page.c @@ -21,8 +21,6 @@ #include #include -#include - #define E_MAIL_CONFIG_IMPORT_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_CONFIG_IMPORT_PAGE, EMailConfigImportPagePrivate)) diff --git a/modules/startup-wizard/e-mail-config-import-page.h b/modules/startup-wizard/e-mail-config-import-page.h index 9f378079c6..79dce20e57 100644 --- a/modules/startup-wizard/e-mail-config-import-page.h +++ b/modules/startup-wizard/e-mail-config-import-page.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.h b/modules/startup-wizard/e-mail-config-import-progress-page.h index 387e6cc19a..f95a937125 100644 --- a/modules/startup-wizard/e-mail-config-import-progress-page.h +++ b/modules/startup-wizard/e-mail-config-import-progress-page.h @@ -21,8 +21,6 @@ #include -#include - #include #include "e-mail-config-import-page.h" diff --git a/modules/startup-wizard/e-startup-assistant.c b/modules/startup-wizard/e-startup-assistant.c index 86d6de17b5..19023244fd 100644 --- a/modules/startup-wizard/e-startup-assistant.c +++ b/modules/startup-wizard/e-startup-assistant.c @@ -21,6 +21,8 @@ #include #include +#include + #include #include "e-mail-config-import-page.h" diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 1ddeaa5168..03c70b7e66 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -25,9 +25,6 @@ #include -#include -#include - #include #include #include -- cgit v1.2.3