aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mail-notification
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-07-11 02:11:48 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-07-11 02:11:48 +0800
commit31fd01398cc76d3c00abbc05d419dfe873bc04c6 (patch)
tree35c238cdb2a8a68936fa659e5269e75ee0042b49 /plugins/mail-notification
parentf9049cded460a9e316fa83ff1941970abfe0fd09 (diff)
parent10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff)
downloadgsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar
gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz
gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.bz2
gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.lz
gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.xz
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/mail-notification')
-rw-r--r--plugins/mail-notification/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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)