Set subdir-objects globally instead of per Makefile

diff --git a/configure.ac b/configure.ac
index c4f6c35fd6d775b07fc1e183d0313e291a82c7fb..e2149ba4465125c1a9ac72bc72e36138ac567b6d 100644 (file)
--- 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 528d7c7cdb79ce1cd3df402a7b1621b39df42f74..386ba451a0e189518b93768640750aa35d446d11 100644 (file)
--- 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 cdd927bc7b859e037aeb5e1abf2c9596e4a5fae4..2fe42ae02c79e3201a5fb75f349cd5af08bf4ae3 100644 (file)
--- 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