Move automake options to Makefile.am

Makefile.am

@@ -42,6 +42,13 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
 	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
 
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = \
+	1.9 \
+	-Wall \
+	check-news \
+	std-options \
+	dist-bzip2 \
+	no-dist-gzip
 
 ###############################################################################
 # MacOS X project

configure.ac

@@ -16,7 +16,7 @@ AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.9 check-news dist-bzip2 no-dist-gzip -Wall])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 dnl Too many people are not aware of maintainer mode: