diff options
31 files changed, 40 insertions, 8 deletions
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index efd1964eb3..01a4c7c375 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -28,6 +28,7 @@ libecontactlisteditor_la_LIBADD = \ $(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) diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 59c918251e..5647c39254 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -45,6 +45,7 @@ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ diff --git a/capplet/Makefile.am b/capplet/Makefile.am index f275153073..a81f1af895 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -56,5 +56,6 @@ evolution_settings_LDADD = \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/em-format/libemformat.la + $(top_builddir)/em-format/libemformat.la \ + $(top_builddir)/libemail-utils/libemail-utils.la diff --git a/composer/Makefile.am b/composer/Makefile.am index 8fd81a2cd1..c3ea743be9 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -63,7 +63,8 @@ libcomposer_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am index 01274d5949..4c64ea87e6 100644 --- a/libemail-engine/Makefile.am +++ b/libemail-engine/Makefile.am @@ -56,6 +56,8 @@ libemail_engine_la_SOURCES = \ libemail_engine_la_LIBADD = \ $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(NULL) diff --git a/mail/Makefile.am b/mail/Makefile.am index b30c4d042a..3a13284668 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -187,6 +187,7 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 57b697b0df..cd037e539e 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -95,6 +95,7 @@ libevolution_module_calendar_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 2d4a774c70..880d62a58e 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -21,6 +21,7 @@ libevolution_module_composer_autosave_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 7fbb354b26..6f79d002d3 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -67,6 +67,7 @@ libevolution_module_mail_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am index d9b46a67b5..0f74b72e90 100644 --- a/modules/mdn/Makefile.am +++ b/modules/mdn/Makefile.am @@ -17,6 +17,7 @@ libevolution_module_mdn_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.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) \ $(GTKHTML_LIBS) diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index def90c1d06..e6bb42284b 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -14,6 +14,7 @@ libevolution_module_offline_alert_la_SOURCES = \ libevolution_module_offline_alert_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) diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index d6b1116693..f9801b7221 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -31,6 +31,7 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(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) \ $(GTKHTML_LIBS) diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index 05748c24c5..acf960525f 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -25,6 +25,7 @@ liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_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) \ $(GTKHTML_LIBS) diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index e92d0549e6..e2efb7092f 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -29,6 +29,7 @@ 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) \ $(GTKHTML_LIBS) diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index d76a894cce..75574a3c2a 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -25,6 +25,7 @@ liborg_gnome_email_custom_header_la_LIBADD = \ $(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) \ $(GTKHTML_LIBS) diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 7f801d7d06..070599347a 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -43,6 +43,7 @@ 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) \ $(GTKHTML_LIBS) diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 9c413dbb18..f266a410b7 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -23,6 +23,7 @@ liborg_gnome_face_la_LIBADD = \ $(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) \ $(GTKHTML_LIBS) diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 3f492bf698..895f95062b 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -22,6 +22,7 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c liborg_gnome_imap_features_la_LIBADD= \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index 71fced63f0..381f99ecf1 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -22,8 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index a3c46efab2..ea1ce2ed26 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -22,7 +22,8 @@ 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)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index c159b7af02..739601ce57 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -20,6 +20,7 @@ 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) \ $(GTKHTML_LIBS) diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 04447c331f..5aeb114e90 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -31,6 +31,7 @@ liborg_gnome_pst_import_la_LIBADD = \ $(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) \ $(GTKHTML_LIBS) \ diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index b19dc8d1a4..2005866c4d 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -36,6 +36,7 @@ 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) \ $(LIBNOTIFY_LIBS) diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 982b6724ec..b9bbc93e7c 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -22,6 +22,7 @@ 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) diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 948dfea677..c899a44368 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -24,6 +24,7 @@ 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) \ $(GTKHTML_LIBS) diff --git a/shell/Makefile.am b/shell/Makefile.am index 4e01ee76e3..ca722fc00b 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -90,12 +90,13 @@ libeshell_la_SOURCES = \ libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libeshell_la_LIBADD = \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/smclient/libeggsmclient.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(EGG_SMCLIENT_LIBS) \ diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 748a54b123..d4e04f230b 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -41,6 +41,7 @@ libevolution_smime_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/smime/lib/libessmime.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 25f447fb33..4ae74a24f5 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -16,8 +16,9 @@ libetimezonedialog_la_SOURCES = \ libetimezonedialog_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libetimezonedialog_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 1dced7f0ea..aa3bb75b73 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -46,6 +46,7 @@ libmenus_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index c7580fba60..1772e7af4b 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -158,6 +158,7 @@ libemiscwidgets_la_LIBADD = \ $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) \ diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 5a82528c8e..216a9fee98 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -172,7 +172,8 @@ libetable_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) |