diff options
51 files changed, 62 insertions, 60 deletions
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 8ccbdc69b0..6f38f09160 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -25,7 +25,7 @@ libecontactlisteditor_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 0c54ae55e0..b73bedac9c 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -73,7 +73,7 @@ libeabwidgets_la_SOURCES = \ ea-addressbook.h libeabwidgets_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index ccaa202c6e..cce02a07d1 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -22,7 +22,7 @@ libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index eeb80af58b..c51eb14d3b 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -45,7 +45,7 @@ contact_print_test_SOURCES = test-print.c contact_print_test_LDADD = \ libecontactprint.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 98e9fe1b35..f11c618da6 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -23,7 +23,7 @@ libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libeabutil_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(CAMEL_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GTKHTML_LIBS) \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 591444a1b4..6d19691d72 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -203,7 +203,7 @@ libevolution_calendar_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)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/e-util/libevolution-util.la \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index ae4ae68fcd..686827c7f1 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -19,7 +19,7 @@ libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/composer/Makefile.am b/composer/Makefile.am index 69d4260ae1..1e846b91ff 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -56,7 +56,7 @@ libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libcomposer_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/configure.ac b/configure.ac index 6f1bb56ae1..9dbc2cec85 100644 --- a/configure.ac +++ b/configure.ac @@ -1429,7 +1429,7 @@ data/evolution-alarm-notify.desktop.in data/icons/Makefile doc/Makefile doc/reference/Makefile -doc/reference/libeshell/Makefile +doc/reference/evolution-shell/Makefile doc/reference/evolution-util/Makefile e-util/Makefile em-format/Makefile diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 7e04e1253d..bfa5808884 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = evolution-util libeshell +SUBDIRS = evolution-util evolution-shell -include $(top_srcdir)/git.mk diff --git a/doc/reference/libeshell/Makefile.am b/doc/reference/evolution-shell/Makefile.am index 90260b593c..5ff5a0af32 100644 --- a/doc/reference/libeshell/Makefile.am +++ b/doc/reference/evolution-shell/Makefile.am @@ -1,5 +1,5 @@ # The name of the module. -DOC_MODULE=libeshell +DOC_MODULE=evolution-shell # The top-level SGML file. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -28,7 +28,7 @@ GTKDOC_CFLAGS= \ GTKDOC_LIBS= \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/doc/reference/libeshell/libeshell-docs.sgml b/doc/reference/evolution-shell/evolution-shell-docs.sgml index 992e0b25b1..ba1305eaf5 100644 --- a/doc/reference/libeshell/libeshell-docs.sgml +++ b/doc/reference/evolution-shell/evolution-shell-docs.sgml @@ -1,12 +1,15 @@ <?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> +]> +<book id="index"> <bookinfo> <title>Evolution Shell Reference Manual</title> <releaseinfo> The latest version of this documentation can be found on-line at - <ulink role="online-location" url="http://library.gnome.org/devel/libeshell/">http://library.gnome.org/devel/libeshell/</ulink>. + <ulink role="online-location" url="http://developer.gnome.org/evolution-shell/">http://developer.gnome.org/evolution-shell/</ulink>. </releaseinfo> </bookinfo> @@ -30,7 +33,7 @@ <xi:include href="xml/action-groups.xml"/> </chapter> - <chapter> + <chapter id="object-tree"> <title>Object Hierarchy</title> <xi:include href="xml/tree_index.sgml"/> </chapter> diff --git a/doc/reference/libeshell/libeshell-overrides.txt b/doc/reference/evolution-shell/evolution-shell-overrides.txt index e69de29bb2..e69de29bb2 100644 --- a/doc/reference/libeshell/libeshell-overrides.txt +++ b/doc/reference/evolution-shell/evolution-shell-overrides.txt diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/evolution-shell/evolution-shell-sections.txt index 5798533fd6..5798533fd6 100644 --- a/doc/reference/libeshell/libeshell-sections.txt +++ b/doc/reference/evolution-shell/evolution-shell-sections.txt diff --git a/doc/reference/libeshell/libeshell.types b/doc/reference/evolution-shell/evolution-shell.types index 2bc9a71963..2bc9a71963 100644 --- a/doc/reference/libeshell/libeshell.types +++ b/doc/reference/evolution-shell/evolution-shell.types diff --git a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml index 49fe04bdf2..49fe04bdf2 100644 --- a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml +++ b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml diff --git a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml index eaee2f12c5..eaee2f12c5 100644 --- a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml +++ b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml diff --git a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml index fec8130b21..fec8130b21 100644 --- a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml +++ b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 36a747d62b..45e96fd0f4 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -110,7 +110,7 @@ endif libemformat_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index b987baf75d..8cc57e91fe 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -19,5 +19,5 @@ Description: libraries needed for Evolution shell components Version: @VERSION@ Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 libgtkhtml-4.0 gtkhtml-editor-4.0 Requires.private: gnome-desktop-3.0 -Libs: -L${privlibdir} -leshell -levolution-util -Wl,-R${privlibdir} +Libs: -L${privlibdir} -levolution-shell -levolution-util -Wl,-R${privlibdir} Cflags: -I${privincludedir} diff --git a/mail/Makefile.am b/mail/Makefile.am index 77ab040d3f..19e7932b8e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -192,7 +192,7 @@ endif libevolution_mail_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 69a42779ca..540a7f889d 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -22,10 +22,9 @@ libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_mail_importers_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/shell/libevolution-shell.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 1438b50ac2..179fb78928 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -54,7 +54,7 @@ module_addressbook_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ $(top_builddir)/addressbook/util/libeabutil.la \ diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am index 4ddfff3890..12f331b3ce 100644 --- a/modules/backup-restore/Makefile.am +++ b/modules/backup-restore/Makefile.am @@ -27,7 +27,7 @@ module_backup_restore_la_SOURCES = \ module_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index ad38b1211f..8422fb1e7f 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -67,7 +67,7 @@ module_calendar_la_SOURCES = \ e-task-shell-view-private.h module_calendar_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 08b263a9a3..08f3c480e7 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -16,7 +16,7 @@ module_composer_autosave_la_SOURCES = \ e-composer-registry.c module_composer_autosave_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am index 0b4d7e9144..7078fc352e 100644 --- a/modules/itip-formatter/Makefile.am +++ b/modules/itip-formatter/Makefile.am @@ -32,7 +32,7 @@ module_itip_formatter_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am index 648d3f3be2..f6840f1fc0 100644 --- a/modules/itip-formatter/plugin/Makefile.am +++ b/modules/itip-formatter/plugin/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 14bbf9b219..232e0de6ee 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -44,7 +44,7 @@ module_mail_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/mail/importers/libevolution-mail-importers.la \ diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index 92ccb91849..be4289402a 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -13,7 +13,7 @@ module_mailto_handler_la_SOURCES = \ module_mailto_handler_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am index 51fc488b05..4934992f8c 100644 --- a/modules/mdn/Makefile.am +++ b/modules/mdn/Makefile.am @@ -15,7 +15,7 @@ module_mdn_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.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 5c7b42e00b..cc8c1e7b84 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -13,7 +13,7 @@ module_offline_alert_la_SOURCES = \ module_offline_alert_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 121480b5ca..3a594bbff8 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -13,7 +13,7 @@ module_plugin_manager_la_SOURCES = \ module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am index 2b241e4ebd..ebfa509b77 100644 --- a/modules/prefer-plain/Makefile.am +++ b/modules/prefer-plain/Makefile.am @@ -22,7 +22,7 @@ module_prefer_plain_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am index 523c4c38d9..9d0b214c59 100644 --- a/modules/settings/Makefile.am +++ b/modules/settings/Makefile.am @@ -50,7 +50,7 @@ module_settings_la_SOURCES = \ module_settings_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index 5dd66d8138..5cd36bb39f 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -14,7 +14,7 @@ module_spamassassin_la_SOURCES = \ module_spamassassin_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 728ab863f0..7700fb8380 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -23,7 +23,7 @@ module_startup_wizard_la_SOURCES = \ module_startup_wizard_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am index 44d32244f1..f5b33d64c5 100644 --- a/modules/text-highlight/Makefile.am +++ b/modules/text-highlight/Makefile.am @@ -24,7 +24,7 @@ module_text_highlight_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 1b66828aab..36f15a011d 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -24,7 +24,7 @@ liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/e-util/libevolution-util.la \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 38cfe0a752..958c6436e9 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index e44d2162f2..3f0d5cf648 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 5fe2b09966..dab9c0412c 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -38,7 +38,7 @@ liborg_gnome_external_editor_la_LDFLAGS = \ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index fbb2cd0873..2b5fef0123 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -27,7 +27,7 @@ liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE liborg_gnome_mail_notification_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 3ef65c6762..ddd23400e3 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -17,7 +17,7 @@ liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index ba32b5aa85..4914ed7a05 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -19,7 +19,7 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index b8a5770a3a..675968e8df 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -25,7 +25,7 @@ liborg_gnome_pst_import_la_SOURCES = pst-importer.c liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_pst_import_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 22d760bcfb..cb7540b2f2 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -34,7 +34,7 @@ liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 3aee9fc403..3bb958ad27 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -21,7 +21,7 @@ liborg_gnome_save_calendar_la_SOURCES = \ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_save_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 5e6c5ad756..6848aa887b 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -20,7 +20,7 @@ liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/shell/Makefile.am b/shell/Makefile.am index f24e88fd8b..a39558b153 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,9 +2,9 @@ bin_PROGRAMS = evolution # Shell library -privsolib_LTLIBRARIES = libeshell.la +privsolib_LTLIBRARIES = libevolution-shell.la -eshellincludedir = $(privincludedir)/shell +evolution_shell_includedir = $(privincludedir)/shell ENUM_TYPES = e-shell.h @@ -21,7 +21,7 @@ e-shell-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES) ENUM_GENERATED = e-shell-enumtypes.h e-shell-enumtypes.c -eshellinclude_HEADERS = \ +evolution_shell_include_HEADERS = \ e-shell.h \ e-shell-backend.h \ e-shell-common.h \ @@ -37,7 +37,7 @@ eshellinclude_HEADERS = \ e-shell-window-actions.h \ es-event.h -libeshell_la_CPPFLAGS = \ +libevolution_shell_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NM_CPPFLAGS) \ -I$(top_srcdir) \ @@ -64,8 +64,8 @@ libeshell_la_CPPFLAGS = \ $(GTKHTML_CFLAGS) \ $(CLUTTER_GTK_CFLAGS) -libeshell_la_SOURCES = \ - $(eshellinclude_HEADERS) \ +libevolution_shell_la_SOURCES = \ + $(evolution_shell_include_HEADERS) \ e-shell.c \ e-shell-backend.c \ e-shell-content.c \ @@ -85,9 +85,9 @@ libeshell_la_SOURCES = \ evo-version.h \ es-event.c -libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) +libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) -libeshell_la_LIBADD = \ +libevolution_shell_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ @@ -130,7 +130,7 @@ evolution_SOURCES = \ e-migrate-base-dirs.c evolution_LDADD = \ - libeshell.la \ + libevolution-shell.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 5d35218038..09c9fa8924 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -37,7 +37,7 @@ libevolution_smime_la_SOURCES = \ libevolution_smime_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/smime/lib/libessmime.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ |