[beast: 4/11] BUILD: configure.ac: move 'subdir-objects' option, to apply to all Makefiles

[Tim Janik <timj src gnome org>]

commit 778fb682a2972377376f5639825e431c4b2024c1
Author: Tim Janik <timj gnu org>
Date:   Sun Oct 30 01:54:58 2016 +0200

    BUILD: configure.ac: move 'subdir-objects' option, to apply to all Makefiles
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am  |    1 -
 configure.ac |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 22bb5ac..5d3b2ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 # BEAST & BSE
 
-AUTOMAKE_OPTIONS = subdir-objects
 include $(top_srcdir)/Makefile.decl
 topdir = $(abs_top_srcdir)
 
diff --git a/configure.ac b/configure.ac
index 8011f81..8a427f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([config])
 AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(configure.h)
 AC_CANONICAL_TARGET                                     # architecture information
-AM_INIT_AUTOMAKE(1.9 dist-xz tar-pax no-dist-gzip no-define foreign)
+AM_INIT_AUTOMAKE(1.9 dist-xz tar-pax no-dist-gzip no-define foreign subdir-objects)
 # version handling
 BST_VERSION="$PACKAGE_VERSION"
 [MAJOR=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\1/'`]