summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2016-10-19 15:21:03 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2016-10-19 15:26:24 +0100
commit59af3a0c15c44b97920fec7afbf289ceddd4ba69 (patch)
tree68835797eb2349a1e6b1688047d876d99e63093d /configure.ac
parent24cb9d4ba6e059b415e9c17b0f4e92ff8865fe22 (diff)
downloadgtk+-59af3a0c15c44b97920fec7afbf289ceddd4ba69.tar.gz
build: Enable subdir-objects
Newer versions of Automake warn about forward compatibility when the build uses sources in sub-directories without the subdir-objects option. Both GTK+ and GDK have an almost-but-not-quite non-recursive Automake layout, with sources in sub-directories contributing to the build of a top-level object. In theory, just adding subdir-objects to AM_INIT_AUTOMAKE would be enough, but the test suite references sources in a different top-level in order to build tests that verify the implementation of private data structures. This is not really allowed when using subdir-objects and out of srcdir builds. In order to fix this case, we require some ad hoc rules to create symbolic links in the appropriate build directory.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3d5cb6e57f..f93c2d3944 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
-AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.14 subdir-objects -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
AM_MAINTAINER_MODE([enable])
# Support silent build rules. Disable