Centralize AUTOMAKE_OPTIONS in configure.ac

Signed-off-by: Michael Jeanson <mjeanson@debian.org>

diff --git a/Makefile.am b/Makefile.am
index 760c40f65fa1a02e0743aae4c6ea1685833efdb7..c4d214b3caa4e7a33b534fbefd64cb42b3689d1f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign dist-xz
 EXTRA_DIST = include LICENSE UPGRADE FAQ \
             TUNABLES README.access README.archives README.listtexts man \
             README.exim4 README.sendmail README.security README.qmail \

diff --git a/configure.ac b/configure.ac
index b2a6a78e2956a39bb3c4f00c05100c1dafd84352..d55dd969d0710664b5d08738077eada673ffbfb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([mlmmj],[1.4.4],[bapt@nours.eu])
 VERSION=$PACKAGE_VERSION
 AC_SUBST(VERSION)
 
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([dist-xz foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/mlmmj-receive.c])
 AC_CONFIG_HEADERS([config.h])
 

diff --git a/contrib/receivestrip/Makefile.am b/contrib/receivestrip/Makefile.am
index 9a6dec211ecf117bad3a5b020e251f3dd384ac1d..2886352d1bb00e9271225809d1f5db9b3ea422d1 100644 (file)
--- a/contrib/receivestrip/Makefile.am
+++ b/contrib/receivestrip/Makefile.am
@@ -1,7 +1,5 @@
 #
 
-AUTOMAKE_OPTIONS = foreign
-
 if WANT_RECEIVESTRIP
   bin_PROGRAMS = mlmmj-receive-strip
 endif

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ab219d353d7ae9925bed2023bb1b1f083347fe4..28ce1bd64bae905c0ba24dc9608513c328d53e5f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 #
 
-AUTOMAKE_OPTIONS = foreign
-
 bin_PROGRAMS = mlmmj-send mlmmj-receive mlmmj-process mlmmj-sub \
                mlmmj-unsub mlmmj-bounce mlmmj-maintd mlmmj-list
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 661272778ef93ab559751fe25d2e3f948e17363a..84fbc53798f94b4b5a9753394e22d8c6a0e4c8cb 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
 check_PROGRAMS = mlmmj fakesmtpd
 
 mlmmj_SOURCES = mlmmj.c \