[libdvbpsi-devel] [PATCH 5/6] Move automake settings from Makefile.am to configure.ac

[Timothy Gu]

This way the options are applied to all the subdirs. In particular, this
fixes this warning:

source file 'file' is in a subdirectory, but option 'subdir-objects' is
disabled

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---
 Makefile.am  | 2 --
 configure.ac | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b1d892..f4b53e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = libdvbpsi.spec libdvbpsi.spec.in libdvbpsi.pc.in bootstrap
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libdvbpsi.pc
 
-AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
-
 doc-dummy:
 
 doc: doc-dummy
diff --git a/configure.ac b/configure.ac
index e5adab6..468569a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.65])
 AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-- 
1.9.1