diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
| commit | 31fd01398cc76d3c00abbc05d419dfe873bc04c6 (patch) | |
| tree | 35c238cdb2a8a68936fa659e5269e75ee0042b49 /plugins | |
| parent | f9049cded460a9e316fa83ff1941970abfe0fd09 (diff) | |
| parent | 10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff) | |
| download | gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.zst gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/util/addressbook.h
calendar/gui/e-week-view-main-item.c
configure.ac
e-util/Makefile.am
mail/em-account-editor.c
mail/em-folder-selection-button.c
shell/e-shell.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/calendar-weather/Makefile.am | 5 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 8ba5fdf2cd..0f3daf774b 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -15,10 +15,11 @@ plugin_DATA = org-gnome-calendar-weather.eplug plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c -liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(LIBGWEATHER_LIBS) +liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_LIBS) \ + $(LIBGWEATHER_LIBS) EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index f1f121f6b5..674c8cd486 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -32,7 +32,7 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) if ENABLE_DBUS -liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS) +liborg_gnome_mail_notification_la_LIBADD += $(NMN_LIBS) endif schemadir = $(GCONF_SCHEMA_FILE_DIR) |