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/plugin-lib/Makefile.am | 10 ++++++++-- modules/plugin-lib/e-plugin-lib.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/plugin-lib') diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am index 0933861156..950e472560 100644 --- a/modules/plugin-lib/Makefile.am +++ b/modules/plugin-lib/Makefile.am @@ -5,7 +5,10 @@ module_plugin_lib_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-plugin-lib\" \ -I$(top_srcdir) \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - $(EVOLUTION_DATA_SERVER_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_plugin_lib_la_SOURCES = \ evolution-module-plugin-lib.c \ @@ -14,7 +17,10 @@ module_plugin_lib_la_SOURCES = \ module_plugin_lib_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_DATA_SERVER_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_plugin_lib_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-lib/e-plugin-lib.h b/modules/plugin-lib/e-plugin-lib.h index 91f440bf49..db1056ac93 100644 --- a/modules/plugin-lib/e-plugin-lib.h +++ b/modules/plugin-lib/e-plugin-lib.h @@ -23,7 +23,7 @@ #define E_PLUGIN_LIB_H #include -#include +#include /* Standard GObject macros */ #define E_TYPE_PLUGIN_LIB \ -- cgit v1.2.3