Fix: Build out of src tree

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-consumerd/Makefile.am b/src/bin/lttng-consumerd/Makefile.am
index 89ae05958b7288469e05c7b2c1598cd783df1f88..a395c0b378033d21bb0d65747331e3435f235990 100644 (file)
--- a/src/bin/lttng-consumerd/Makefile.am
+++ b/src/bin/lttng-consumerd/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 lttnglibexec_PROGRAMS = lttng-consumerd
 

diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am
index cb625e5c1bfa3ed31c24d12c83e172fc4361d282..a04b910f61d76eb264b3b02fccd0eba7aec94742 100644 (file)
--- a/src/bin/lttng-relayd/Makefile.am
+++ b/src/bin/lttng-relayd/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
+                         -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
                          -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
 AM_CFLAGS = -fno-strict-aliasing

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index b13059d77a155d03a4a13f7cf570e5499c432fbd..9b9a6c81b3997ad055ba86cfefef9ae5776fb0f9 100644 (file)
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
+                         -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
                          -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
 AM_CFLAGS = -fno-strict-aliasing

diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am
index 0381aa6560838df6591c5b798496a430655df19a..21eebab7d6b3a797e6805203bf9131b25ec90d63 100644 (file)
--- a/src/bin/lttng/Makefile.am
+++ b/src/bin/lttng/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
+                         -DINSTALL_BIN_PATH=\""$(bindir)"\"
 
 bin_PROGRAMS = lttng
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 577dffe856d96bed26f53d10c0f09869a33b335d..da65374dbe5f3c64edad99d99ef476a2f140dcf5 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 SUBDIRS = compat hashtable kernel-ctl sessiond-comm relayd \
                  kernel-consumer ust-consumer testpoint

diff --git a/src/common/compat/Makefile.am b/src/common/compat/Makefile.am
index 91cd3bdcf7bc3237ce39353c9c37f18d06ac252f..2d832822f538432933d32a61353acc3fb01cb7de 100644 (file)
--- a/src/common/compat/Makefile.am
+++ b/src/common/compat/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libcompat.la
 

diff --git a/src/common/hashtable/Makefile.am b/src/common/hashtable/Makefile.am
index 7a2b83517a4a0a5cdddfb13246afee44c438a66c..62e22c117036c6c9fb752893811025687624c6cf 100644 (file)
--- a/src/common/hashtable/Makefile.am
+++ b/src/common/hashtable/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libhashtable.la
 

diff --git a/src/common/kernel-consumer/Makefile.am b/src/common/kernel-consumer/Makefile.am
index 008041e1d8064b7669def0d28a3a950ab11a502a..ed5462a6597fa50999bea7a216dd562b9087fef5 100644 (file)
--- a/src/common/kernel-consumer/Makefile.am
+++ b/src/common/kernel-consumer/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+
 # Kernel consumer library
 noinst_LTLIBRARIES = libkernel-consumer.la
 

diff --git a/src/common/kernel-ctl/Makefile.am b/src/common/kernel-ctl/Makefile.am
index a56a0218b290f718122795e292689004771b7248..ab057dd3618b8abada4f04e8baf4d589d28f3734 100644 (file)
--- a/src/common/kernel-ctl/Makefile.am
+++ b/src/common/kernel-ctl/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libkernel-ctl.la
 

diff --git a/src/common/relayd/Makefile.am b/src/common/relayd/Makefile.am
index 84eee1b8e59748310e3c11d9ffcbb0239b0580ff..274da87be1cea48b1dade25d286616f6bf7fb068 100644 (file)
--- a/src/common/relayd/Makefile.am
+++ b/src/common/relayd/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+
 # Relayd library
 noinst_LTLIBRARIES = librelayd.la
 

diff --git a/src/common/sessiond-comm/Makefile.am b/src/common/sessiond-comm/Makefile.am
index 2a70d54ce0f36c0ab76b77510e6a2f0983267783..24063f862b3e30b0119e328578c675b63c99f07b 100644 (file)
--- a/src/common/sessiond-comm/Makefile.am
+++ b/src/common/sessiond-comm/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+
 # Session daemon communication lib
 noinst_LTLIBRARIES = libsessiond-comm.la
 

diff --git a/src/common/ust-consumer/Makefile.am b/src/common/ust-consumer/Makefile.am
index c79c4a55e8ed42b2c8b64d1465c92d3495232e8d..ab8d38add5fc1fe5b3608ceee8446c9cfce4e7a0 100644 (file)
--- a/src/common/ust-consumer/Makefile.am
+++ b/src/common/ust-consumer/Makefile.am
@@ -1,4 +1,7 @@
 if HAVE_LIBLTTNG_UST_CTL
+
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+
 noinst_LTLIBRARIES = libust-consumer.la
 
 libust_consumer_la_SOURCES = ust-consumer.c ust-consumer.h

diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am
index f1b4b500c27deedfd4018bd4b1eb348396c6a723..2681bddb252b3ad5e69d681c68bbfbc7a56f9c1a 100644 (file)
--- a/src/lib/lttng-ctl/Makefile.am
+++ b/src/lib/lttng-ctl/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir)
+
 SUBDIRS = filter
 
 lib_LTLIBRARIES = liblttng-ctl.la

diff --git a/src/lib/lttng-ctl/filter/Makefile.am b/src/lib/lttng-ctl/filter/Makefile.am
index 45ed418ebbc632e97ee704312df78fa7daade6ca..85a427447c39d88061257745011bb2c9bcf5ac42 100644 (file)
--- a/src/lib/lttng-ctl/filter/Makefile.am
+++ b/src/lib/lttng-ctl/filter/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
+                         -I$(srcdir) -I$(builddir)
+
 noinst_PROGRAMS = filter-grammar-test
 noinst_LTLIBRARIES = libfilter.la
 noinst_HEADERS = filter-ast.h

diff --git a/tests/kernel/Makefile.am b/tests/kernel/Makefile.am
index 2992afbf5bbd5898ec29bff56d2939e14e2f3ed9..8872af425f35d8c52812bfa4ca2015e94270652c 100644 (file)
--- a/tests/kernel/Makefile.am
+++ b/tests/kernel/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g -Wall -I../
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall
 AM_LDFLAGS = -lurcu -lurcu-cds
 
 EXTRA_DIST = runall.sh run-kernel-tests.sh

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index faa836ca6642a1b54b7666dd1d1f16af4103f7bd..173dce21fff3beffa7e917e54487e64aa754202a 100644 (file)
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = streaming health
 
-AM_CFLAGS = -g -Wall -I../
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall
 AM_LDFLAGS = -lurcu -lurcu-cds
 
 EXTRA_DIST = runall.sh

diff --git a/tests/tools/streaming/Makefile.am b/tests/tools/streaming/Makefile.am
index f7a3c9d7552cdfcdea30373b9077735678e78326..3ff8ef0a1cb55e323aa238c6de2dd9a236b09b2f 100644 (file)
--- a/tests/tools/streaming/Makefile.am
+++ b/tests/tools/streaming/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2 -g -I../../
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g
 AM_LDFLAGS =
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL

diff --git a/tests/ust/Makefile.am b/tests/ust/Makefile.am
index 146bff250b0197004e3170cfb4953a948458c75a..387842d11a6d105142d69e47042ac104fdcb14c6 100644 (file)
--- a/tests/ust/Makefile.am
+++ b/tests/ust/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session
 
-AM_CFLAGS = -g -Wall -I../
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests -I$(top_srcdir)/src -g -Wall 
 AM_LDFLAGS = -lurcu -lurcu-cds
 
 EXTRA_DIST = runall.sh run-ust-global-tests.sh

diff --git a/tests/ust/before-after/Makefile.am b/tests/ust/before-after/Makefile.am
index 29652dcbbccb214a828eedc41214c8bd6baddb05..d197d72f517de698c0773f57b0a2f0f9bd1bbda1 100644 (file)
--- a/tests/ust/before-after/Makefile.am
+++ b/tests/ust/before-after/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2
+AM_CFLAGS = -I$(srcdir) -O2
 AM_LDFLAGS = -llttng-ust
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL

diff --git a/tests/ust/high-throughput/Makefile.am b/tests/ust/high-throughput/Makefile.am
index 01d5ad28cf6226df445ca04f176230bf7b2303a5..cff8fe423051fb8c9f06e7a49ecf730a03d17d6d 100644 (file)
--- a/tests/ust/high-throughput/Makefile.am
+++ b/tests/ust/high-throughput/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2
+AM_CFLAGS = -I$(srcdir) -O2
 AM_LDFLAGS = -llttng-ust
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL

diff --git a/tests/ust/low-throughput/Makefile.am b/tests/ust/low-throughput/Makefile.am
index aefdf5318c4a512fe2180f6dcead70b0ebb6ffc5..a1df9f5e2600dcd8304b4beae25cb43d2f347feb 100644 (file)
--- a/tests/ust/low-throughput/Makefile.am
+++ b/tests/ust/low-throughput/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2
+AM_CFLAGS = -I$(srcdir) -O2
 AM_LDFLAGS = -llttng-ust
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL

diff --git a/tests/ust/multi-session/Makefile.am b/tests/ust/multi-session/Makefile.am
index 29652dcbbccb214a828eedc41214c8bd6baddb05..d197d72f517de698c0773f57b0a2f0f9bd1bbda1 100644 (file)
--- a/tests/ust/multi-session/Makefile.am
+++ b/tests/ust/multi-session/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2
+AM_CFLAGS = -I$(srcdir) -O2
 AM_LDFLAGS = -llttng-ust
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL

diff --git a/tests/ust/nprocesses/Makefile.am b/tests/ust/nprocesses/Makefile.am
index d3fdcbd4120cf5bdcf5c17250fbae09eabffd1dc..20beea0be80264c8b35c4634dcf54dccab175f29 100644 (file)
--- a/tests/ust/nprocesses/Makefile.am
+++ b/tests/ust/nprocesses/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I. -O2
+AM_CFLAGS = -I$(srcdir) -O2
 AM_LDFLAGS = -llttng-ust
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL