Fix another double define, and add subdir-objects where needed
authorColin Leroy <colin@colino.net>
Fri, 25 Apr 2014 08:36:28 +0000 (10:36 +0200)
committerColin Leroy <colin@colino.net>
Fri, 25 Apr 2014 08:36:28 +0000 (10:36 +0200)
src/plugins/notification/gtkhotkey/Makefile.am
src/plugins/spam_report/Makefile.am

index b56fbde..111fe00 100644 (file)
@@ -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 \
index 585fe4b..35d241e 100644 (file)
@@ -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) \