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. --- plugins/attachment-reminder/Makefile.am | 5 ++--- plugins/attachment-reminder/attachment-reminder.c | 7 ------- plugins/bbdb/Makefile.am | 4 ++-- plugins/bbdb/bbdb.c | 3 --- plugins/bbdb/gaimbuddies.c | 5 +---- plugins/dbx-import/Makefile.am | 10 ++++++---- plugins/dbx-import/dbx-importer.c | 7 +------ plugins/email-custom-header/Makefile.am | 6 ++---- plugins/email-custom-header/email-custom-header.c | 3 +-- plugins/external-editor/Makefile.am | 4 ++-- plugins/external-editor/external-editor.c | 1 - plugins/face/Makefile.am | 6 ++---- plugins/face/face.c | 3 --- plugins/mail-notification/Makefile.am | 4 ++-- plugins/mail-notification/mail-notification.c | 1 - plugins/mail-to-task/Makefile.am | 11 ++++++----- plugins/mail-to-task/mail-to-task.c | 6 ------ plugins/mailing-list-actions/Makefile.am | 5 ++--- plugins/mailing-list-actions/mailing-list-actions.c | 3 +-- plugins/mark-all-read/Makefile.am | 10 ++++++---- plugins/mark-all-read/mark-all-read.c | 1 - plugins/pst-import/Makefile.am | 7 ++++--- plugins/pst-import/pst-importer.c | 13 +++++-------- plugins/publish-calendar/Makefile.am | 12 +++++++----- plugins/publish-calendar/publish-calendar.c | 3 --- plugins/publish-calendar/publish-location.c | 3 ++- plugins/publish-calendar/url-editor-dialog.h | 1 - plugins/save-calendar/Makefile.am | 10 ++++++---- plugins/save-calendar/format-handler.h | 4 +++- plugins/save-calendar/save-calendar.c | 3 --- plugins/templates/Makefile.am | 4 ++-- plugins/templates/templates.c | 5 ----- 32 files changed, 65 insertions(+), 105 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 0339e01f9c..393f4d33c9 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -13,10 +13,10 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c @@ -29,11 +29,10 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(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)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 0079014c5b..e005fbdfdf 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -28,20 +28,13 @@ #include #include -#include -#include #include #include -#include -#include - #include #include "composer/e-msg-composer.h" #include "composer/e-composer-actions.h" -#include "widgets/misc/e-attachment-view.h" -#include "widgets/misc/e-attachment-store.h" #define CONF_KEY_ATTACH_REMINDER_CLUES "attachment-reminder-clues" diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index d3e006e80d..c2b58db08e 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -15,9 +15,9 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c @@ -30,9 +30,9 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index c19551944b..c6e60b005a 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -28,9 +28,6 @@ #include #include -#include - -#include #include #include #include diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index b59e683c8e..d9a0cd9bd3 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -36,18 +36,15 @@ #include #include #include -#include #include #include #include -#include - #include #include -#include +#include #include "bbdb.h" diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index 5bead7d3fd..011f10f349 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -13,10 +13,11 @@ plugin_LTLIBRARIES = liborg-gnome-dbx-import.la liborg_gnome_dbx_import_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c @@ -27,9 +28,10 @@ liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-dbx-import.eplug.xml diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 5d00da5e19..0eb5f4f94c 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -49,17 +49,12 @@ #include #include #include -#include - -#include -#include -#include #include #include #include -#include +#include #include #include diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index a8d601658e..446a528c6a 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -8,12 +8,11 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_email_custom_header_la_SOURCES = \ @@ -23,11 +22,10 @@ liborg_gnome_email_custom_header_la_SOURCES = \ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 5f66489c07..25f1feff63 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -26,11 +26,10 @@ #include #include + #include "mail/em-utils.h" #include "mail/em-event.h" #include "composer/e-msg-composer.h" -#include "e-util/e-config.h" -#include "e-util/e-util.h" #include "email-custom-header.h" #define d(x) diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index f0ffd1ac67..080e4e0b8e 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -26,9 +26,9 @@ liborg_gnome_external_editor_la_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir) \ -I$(top_srcdir)/composer \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_external_editor_la_SOURCES = \ @@ -43,9 +43,9 @@ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = \ diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 0c43acbfdc..19a8159e56 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 0522cc0f82..1fe52d0989 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -8,12 +8,11 @@ liborg_gnome_face_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_face_la_SOURCES = face.c @@ -21,11 +20,10 @@ liborg_gnome_face_la_SOURCES = face.c liborg_gnome_face_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/face/face.c b/plugins/face/face.c index c9023dc69b..45d3d2ada9 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -29,9 +29,6 @@ #include #include #include -#include -#include -#include #define d(x) diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 042dcd0c9e..c04d64483b 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -14,11 +14,11 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la liborg_gnome_mail_notification_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(CANBERRA_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mail_notification_la_SOURCES = mail-notification.c @@ -29,12 +29,12 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) BUILT_SOURCES = $(plugin_DATA) diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index cc01d65c30..e0973d22fa 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -35,7 +35,6 @@ #include -#include #include #include #include diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index da78753556..a8bdfefd9e 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -7,9 +7,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la liborg_gnome_mail_to_task_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c @@ -21,11 +22,11 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 042c2d3e7d..cf15d4056d 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -33,15 +33,9 @@ #include #include -#include #include -#include - -#include -#include - #include #include diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index ea1ce2ed26..f40cd9d2e6 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -6,10 +6,10 @@ plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la liborg_gnome_mailing_list_actions_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c @@ -22,10 +22,9 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) error_DATA = org-gnome-mailing-list-actions.error diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index fb6be6ba1d..c6a3cab235 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -38,7 +37,7 @@ #include -#include +#include #include #include diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 4740bff5fb..2f1f34018e 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -7,9 +7,10 @@ plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la liborg_gnome_mark_all_read_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c @@ -19,9 +20,10 @@ liborg_gnome_mark_all_read_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.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) EXTRA_DIST = org-gnome-mark-all-read.eplug.xml diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 45969492c9..e4213fd324 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -28,7 +28,6 @@ #include #include #include -#include #include diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index b81e0d29c2..8d5d294e33 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -14,10 +14,11 @@ plugin_LTLIBRARIES = liborg-gnome-pst-import.la liborg_gnome_pst_import_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LIBPST_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -29,10 +30,10 @@ liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 768d1b17c0..eced3ba259 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -41,22 +41,19 @@ #include #include #include -#include -#include -#include - -#include +#include #include -#include -#include -#include #include #include #include #include +#include +#include +#include + #include #include diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 2005866c4d..0786c40ac8 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -11,13 +11,14 @@ plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la liborg_gnome_publish_calendar_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) liborg_gnome_publish_calendar_la_SOURCES = \ publish-calendar.c \ @@ -36,9 +37,10 @@ liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(LIBNOTIFY_LIBS) EXTRA_DIST = \ diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 7175050aff..00afe6be17 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -31,9 +31,6 @@ #include #include -#include -#include -#include #include #include diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 465fff103c..f84d589287 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -29,7 +29,8 @@ #include #include -#include + +#include "e-util/e-util.h" static EPublishUri * migrateURI (const gchar *xml, diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 96fb154c6f..0f2217289e 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -24,7 +24,6 @@ #define URL_EDITOR_DIALOG_H #include -#include #include "publish-location.h" G_BEGIN_DECLS diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index b9bbc93e7c..7203ece4c1 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -7,9 +7,10 @@ plugin_LTLIBRARIES = liborg-gnome-save-calendar.la liborg_gnome_save_calendar_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_save_calendar_la_SOURCES = \ save-calendar.c \ @@ -22,9 +23,10 @@ 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)/shell/libeshell.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h index 4a2dbab985..8381258b48 100644 --- a/plugins/save-calendar/format-handler.h +++ b/plugins/save-calendar/format-handler.h @@ -20,8 +20,10 @@ * */ +#include #include -#include + +#include typedef struct _FormatHandler FormatHandler; diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 9e2c99754e..8e8ca93507 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -30,9 +30,6 @@ #include #include -#include -#include - #include #include #include diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index d4a637d0c3..b20f11f242 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -7,11 +7,11 @@ plugin_LTLIBRARIES = liborg-gnome-templates.la liborg_gnome_templates_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) liborg_gnome_templates_la_SOURCES = templates.c @@ -24,9 +24,9 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-templates.eplug.xml diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 5416a8f8f9..e5c05259a6 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -30,11 +30,6 @@ #include #include -#include -#include -#include -#include - #include #include -- cgit v1.2.3