diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-05-29 00:36:37 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-05-29 00:50:18 +0800 |
| commit | 005ac1efa32c7e3a3dc5eb959b69fdee5fb91320 (patch) | |
| tree | b7eaca0fc61577360d34e35464465d7232e4b414 /modules/startup-wizard/Makefile.am | |
| parent | 2c9f0932e8c2bc100f8ec7335a20fbfecea052a2 (diff) | |
| download | gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.gz gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.tar.zst gsoc2013-evolution-005ac1efa32c7e3a3dc5eb959b69fdee5fb91320.zip | |
Make the settings capplet optional.
The evolution-settings capplet was originally designed for Anjal, it was
used in MeeGo as part of the Express Mode effort, but doesn't really fit
in GNOME 3 nowadays (nor did it really fit in GNOME 2, in my opinion).
Add a --with-capplet configure switch defaulting to 'no'. The capplet
will eventually be removed unless I see someone actively maintaining it.
Diffstat (limited to 'modules/startup-wizard/Makefile.am')
| -rw-r--r-- | modules/startup-wizard/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 1401abae2f..ce86f1c9da 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -11,6 +11,11 @@ module_startup_wizard_la_CPPFLAGS = \ module_startup_wizard_la_SOURCES = \ evolution-startup-wizard.c +if WITH_CAPPLET +libevolution_mail_settings_la = \ + $(top_builddir)/capplet/settings/libevolution-mail-settings.la +endif + module_startup_wizard_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ @@ -18,9 +23,9 @@ module_startup_wizard_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ - $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(libevolution_mail_settings_la) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) |