From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeremie.galarneau@efficios.com (=?UTF-8?Q?J=C3=A9r=C3=A9mie_Galarneau?=) Date: Mon, 21 Sep 2015 12:19:42 -0400 Subject: [lttng-dev] [PATCH lttng-tools] Fix: add subdir-objects to Makefile.am In-Reply-To: <1442516950-22760-1-git-send-email-mathieu.desnoyers@efficios.com> References: <1442516950-22760-1-git-send-email-mathieu.desnoyers@efficios.com> Message-ID: Merged in master and stable-2.7. Thanks! J?r?mie On Thu, Sep 17, 2015 at 3:09 PM, Mathieu Desnoyers wrote: > Fixes the following warning introduced by the runas worker changes. Use > the same technique used in src/bin/lttng/Makefile.am. > > src/common/Makefile.am:17: warning: source file 'sessiond-comm/unix.c' is in a subdirectory, > src/common/Makefile.am:17: but option 'subdir-objects' is disabled > automake: warning: possible forward-incompatibility. > automake: At least a source file is in a subdirectory, but the 'subdir-objects' > automake: automake option hasn't been enabled. For now, the corresponding output > automake: object file(s) will be placed in the top-level directory. However, > automake: this behaviour will change in future Automake versions: they will > automake: unconditionally cause object files to be placed in the same subdirectory > automake: of the corresponding sources. > automake: You are advised to start using 'subdir-objects' option throughout your > automake: project, to avoid future incompatibilities. > > Signed-off-by: Mathieu Desnoyers > --- > src/common/Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/common/Makefile.am b/src/common/Makefile.am > index 64110e6..5b71612 100644 > --- a/src/common/Makefile.am > +++ b/src/common/Makefile.am > @@ -1,5 +1,7 @@ > AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src > > +AUTOMAKE_OPTIONS = subdir-objects > + > SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \ > kernel-consumer ust-consumer testpoint index config > > -- > 2.1.4 > -- J?r?mie Galarneau EfficiOS Inc. http://www.efficios.com