From: Filipe Brandenburger Date: Fri, 1 May 2015 23:48:21 +0000 (-0700) Subject: build-sys: enable "subdir-objects" automake option X-Git-Tag: v3.3.11~61^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edd66515ef75140f99814ee6ca8bfb2032e2a88f;p=procps-ng build-sys: enable "subdir-objects" automake option Otherwise, automake 1.14 will warn that this option will become the default in an upcoming release, which will cause problems for the procps-ng build. Now that the automake rules were merged in the top level Makefile.am, it is possible to enable "subdir-objects" without breaking the build or the dist. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the same tree before and after this change. Confirmed that binaries are also placed in the same locations in the build tree. Signed-off-by: Filipe Brandenburger --- diff --git a/Makefile.am b/Makefile.am index 0d6f0fd2..3d0a09fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -#AUTOMAKE_OPTIONS = subdir-objects - AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -I$(top_srcdir) \ diff --git a/configure.ac b/configure.ac index 2f804bba..4b647415 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_INIT([procps-ng], m4_esyscmd([misc/git-version-gen .tarball-version]), [procps@freelists.org],,[http://gitorious.org/procps]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) AM_SILENT_RULES([yes]) AC_CONFIG_SRCDIR([free.c]) AC_CONFIG_HEADERS([config.h])