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. --- calendar/alarm-notify/Makefile.am | 9 +++++---- calendar/alarm-notify/alarm-notify-dialog.c | 6 ++---- calendar/alarm-notify/alarm-notify.c | 2 ++ calendar/alarm-notify/alarm-notify.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'calendar/alarm-notify') diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 775a3693cb..2ff5b3dd46 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -12,7 +12,6 @@ evolution_alarm_notify_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ @@ -21,7 +20,9 @@ evolution_alarm_notify_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - $(CANBERRA_CFLAGS) + $(CANBERRA_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) ui_DATA = \ alarm-notify.ui @@ -44,17 +45,17 @@ evolution_alarm_notify_SOURCES = \ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) $(EVOLUTIONALARMNOTIFYICON) if OS_WIN32 diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index 3bb705a772..ac6ce49d93 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -30,14 +30,12 @@ #include #include +#include "e-util/e-util.h" + #include "alarm-notify-dialog.h" #include "config-data.h" #include "util.h" -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "misc/e-buffer-tagger.h" - enum { ALARM_DISPLAY_COLUMN, ALARM_SUMMARY_COLUMN, diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c index 54242f2049..ce7efee9ac 100644 --- a/calendar/alarm-notify/alarm-notify.c +++ b/calendar/alarm-notify/alarm-notify.c @@ -27,6 +27,8 @@ #include #include +#include "e-util/e-util.h" + #include "alarm.h" #include "alarm-notify.h" #include "alarm-queue.h" diff --git a/calendar/alarm-notify/alarm-notify.h b/calendar/alarm-notify/alarm-notify.h index 61097f310a..45de689a4e 100644 --- a/calendar/alarm-notify/alarm-notify.h +++ b/calendar/alarm-notify/alarm-notify.h @@ -28,7 +28,6 @@ #include #include -#include /* Standard GObject macros */ #define TYPE_ALARM_NOTIFY \ -- cgit v1.2.3