[lttng-dev] [PATCH lttng-tools] Fix: add subdir-objects to Makefile.am

[Jérémie Galarneau]

Merged in master and stable-2.7.

Thanks!
Jérémie

On Thu, Sep 17, 2015 at 3:09 PM, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> 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 <mathieu.desnoyers at efficios.com>
> ---
>  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