[v5,18/25] automake: move foreign Automake option to configure.ac

Message ID 1503396009-8350-19-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • [v5,1/25] configure: move configure header to include dir
Related show

Commit Message

Github ODP bot Aug. 22, 2017, 10 a.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Instead of specifying foreign Automake option on a per-dir bases, move
that option to toplevel configure.ac, making it global at the same time.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 127 (lumag:improve-build)
 ** https://github.com/Linaro/odp/pull/127
 ** Patch: https://github.com/Linaro/odp/pull/127.patch
 ** Base sha: aecb3c7a442b426761f1e6f43308a1e9ea709ef3
 ** Merge commit sha: 86e036501e05c61e5570d0908af382a61c2d4e89
 **/
 Makefile.am                         | 1 -
 configure.ac                        | 2 +-
 test/common_plat/common/Makefile.am | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/Makefile.am b/Makefile.am
index 76ceb851..e1ea07d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@ 
 ACLOCAL_AMFLAGS=-I m4
-AUTOMAKE_OPTIONS = foreign
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp	\
 			       --enable-test-example	\
 			       --enable-test-helper	\
diff --git a/configure.ac b/configure.ac
index 0ab8f585..4016176b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@  AC_SUBST(ODP_VERSION_API_MINOR)
 AC_CONFIG_FILES([include/odp/api/spec/version.h
                  include/odp/api/spec/deprecated.h])
 
-AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects])
+AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign])
 AC_CONFIG_SRCDIR([include/odp/api/spec/init.h])
 AM_CONFIG_HEADER([include/config.h])
 
diff --git a/test/common_plat/common/Makefile.am b/test/common_plat/common/Makefile.am
index 7d88d2ea..9fd08ee8 100644
--- a/test/common_plat/common/Makefile.am
+++ b/test/common_plat/common/Makefile.am
@@ -1,4 +1,3 @@ 
-AUTOMAKE_OPTIONS = foreign
 include $(top_srcdir)/test/Makefile.inc
 
 noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la