From 7cdb614c3e1dcf585e70bb2b1c5a6604b96035dd Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 25 May 2016 17:55:15 +0200
Subject: [PATCH] Set subdir-objects globally instead of per Makefile

---
 configure.ac           | 2 +-
 src/Makefile.am        | 2 --
 src/daemon/Makefile.am | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c4f6c35f..e2149ba4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_ifdef([LT_PACKAGE_VERSION],
 
 AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
 
-AM_INIT_AUTOMAKE([tar-pax dist-bzip2 foreign])
+AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LANG(C)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 528d7c7c..386ba451 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ endif
 AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 noinst_LTLIBRARIES =
 check_PROGRAMS =
 TESTS =
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index cdd927bc..2fe42ae0 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -33,8 +33,6 @@ if BUILD_WITH_LIBDEVINFO
 COMMON_LIBS += -ldevinfo
 endif
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 sbin_PROGRAMS = collectd
 
 noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libmetadata.la libplugin_mock.la
-- 
2.11.0