From: Mathieu Desnoyers Date: Thu, 17 Sep 2015 19:09:10 +0000 (-0400) Subject: Fix: add subdir-objects to Makefile.am X-Git-Tag: v2.7.0~16 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=895334f9dc464f7727e863978ee21bf4ac3ea496;p=lttng-tools.git Fix: add subdir-objects to Makefile.am 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 Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 64110e615..5b716129c 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