From: Rhys Kidd Date: Thu, 31 Jan 2019 04:12:53 +0000 (-0500) Subject: config: Set automake options consistenly in one location X-Git-Tag: VALGRIND_3_15_0~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdfab93fabc7b6e703db4a268d2fd8813c2df24d;p=thirdparty%2Fvalgrind.git config: Set automake options consistenly in one location Avoid use of two manners of setting automake configuration options, and consolidate them into AM_INIT_AUTOMAKE macro. Signed-off-by: Rhys Kidd --- diff --git a/Makefile.am b/Makefile.am index 631c845ab2..a63cd9bdec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 +AUTOMAKE_OPTIONS = 1.10 include $(top_srcdir)/Makefile.all.am diff --git a/configure.ac b/configure.ac index b69935e9bf..d0b68b46be 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_INIT([Valgrind],[3.15.0.GIT],[valgrind-users@lists.sourceforge.net]) AC_CONFIG_SRCDIR(coregrind/m_main.c) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE