From 0da225829234744b1141aea3a7c54ad7d74679a7 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 22 Feb 2014 18:02:06 +0000 Subject: [PATCH] Add the 'subdir-objects' option in the automake makefile. This rearranges the object files so that they each live alongside their original source file, instead of all being in the same directory. To my way of thinking this is a more or less neutral change (perhaps marginally less tidy), but autotools is apparently beginning to think it's the One True Way and 1.14 will give a warning if you don't have it enabled. [originally from svn r10142] --- mkfiles.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mkfiles.pl b/mkfiles.pl index bb767c16..563d83f6 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -1482,6 +1482,10 @@ if (defined $makefiles{'am'}) { "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n". "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n\n"; + # 2014-02-22: as of automake-1.14 we begin to get complained at if + # we don't use this option + print "AUTOMAKE_OPTIONS = subdir-objects\n\n"; + # Complete list of source and header files. Not used by the # auto-generated parts of this makefile, but Recipe might like to # have it available as a variable so that mandatory-rebuild things