Fix another double define, and add subdir-objects where needed

diff --git a/src/plugins/notification/gtkhotkey/Makefile.am b/src/plugins/notification/gtkhotkey/Makefile.am
index b56fbde4c4511887acb850b73bdfe3ab80ccdd44..111fe004e91a674f4a131496cfba11c8b09a577b 100644 (file)
--- a/src/plugins/notification/gtkhotkey/Makefile.am
+++ b/src/plugins/notification/gtkhotkey/Makefile.am
@@ -2,6 +2,8 @@ if BUILD_HOTKEYS
 noinst_LTLIBRARIES = libcmnpgtkhotkey.la
 endif
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 libcmnpgtkhotkey_la_SOURCES = \
        gtk-hotkey-info.c \
        gtk-hotkey-error.c \

diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 585fe4b33dd18bd0505dd65738c6796726eb5c9e..35d241e844d6981feb0cbb8da93b6b10a214f27b 100644 (file)
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -69,12 +69,6 @@ spamreport_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
 
 spamreport_la_DEPENDENCIES = $(plugin_deps)
 
-IFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/common \
-       -I$(top_builddir)/src/common \
-       -I$(top_srcdir)/src/gtk
-
 spamreport_la_CPPFLAGS = \
        $(IFLAGS) \
        $(GLIB_CFLAGS) \