Build out of src tree

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-ctl/Makefile.am b/liblttng-ust-ctl/Makefile.am
index 4e341be703e16135b739fef9940abced6c04b9a5..1a57fef86ff3c72fcd534d7ba5ec6b5c3e49ca02 100644 (file)
--- a/liblttng-ust-ctl/Makefile.am
+++ b/liblttng-ust-ctl/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttng-ust-comm
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttng-ust-comm -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-ctl.la

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index 6220f76c6c64ec2d6d239f87ee0f4270f08d9c68..159e7df598c7d7997d091d41d203a909b65ab45d 100644 (file)
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 9d9477b9eaad88f84c463b2d8359cb00d9c12f1c..04b9ff3f5773344136423a0ad7476d988d7973e9 100644 (file)
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la

diff --git a/libringbuffer/Makefile.am b/libringbuffer/Makefile.am
index b5b0ebd1f2e7cda10a6cc6dc17d7ff1c610c9c2e..271c8beed9ffdd385e9a39902d4c463b688d3887 100644 (file)
--- a/libringbuffer/Makefile.am
+++ b/libringbuffer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 noinst_LTLIBRARIES = libringbuffer.la
@@ -12,7 +12,7 @@ libringbuffer_la_SOURCES = \
        backend.h backend_internal.h backend_types.h \
        frontend_api.h frontend.h frontend_internal.h frontend_types.h \
        nohz.h vatomic.h tlsfixup.h
-       
+
 libringbuffer_la_LIBADD = \
        -lpthread \
        -lrt

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index f96980ed6514ae91d2a0024011282de573c41f39..04b6e8c990f541c71e3d1f87c2c94a67f3c8e8a7 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,6 +1,6 @@
 # -Wsystem-headers is needed to print warnings in the tracepoint
 # description file.
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 # Set LIBS to nothing so the application does not link on useless
 # libraries.

diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am
index 48b3da2874481ebea7560d2e7edbbd2098ef79dd..c0a3c868d36bbe5cf9a807aeee47eee02da0ca93 100644 (file)
--- a/tests/fork/Makefile.am
+++ b/tests/fork/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c ust_tests_fork.h

diff --git a/tests/hello-static-lib/Makefile.am b/tests/hello-static-lib/Makefile.am
index 0eff080cdd2bb4746299b9fd90a1d9a6bf203ce0..c51d5310bda6fb2f704e1c0439ac6085f3ae2623 100644 (file)
--- a/tests/hello-static-lib/Makefile.am
+++ b/tests/hello-static-lib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 noinst_LTLIBRARIES = liblttng-ust-provider-ust-test-hello.la
 liblttng_ust_provider_ust_test_hello_la_SOURCES = \

diff --git a/tests/hello.cxx/Makefile.am b/tests/hello.cxx/Makefile.am
index 3e84796a731b4ecf965e57bae6d0f0f967190e99..86f2c43f996b118c12077682cde564cfbd12f6f0 100644 (file)
--- a/tests/hello.cxx/Makefile.am
+++ b/tests/hello.cxx/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.cpp tp.c ust_tests_hello.h

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index d866b6da6a1a9851c4061badeadef113243c9e4e..28ab410633e708b3e43cf711c7d2eaeb5a996b04 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c ust_tests_hello.h

diff --git a/tests/ust-basic-tracing/Makefile.am b/tests/ust-basic-tracing/Makefile.am
index 0a0a2f08610d7ea288655e6440e81f898e345424..175adc85a6f4033baf4136072da92057414bdeb6 100644 (file)
--- a/tests/ust-basic-tracing/Makefile.am
+++ b/tests/ust-basic-tracing/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libust
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/libust 
 
 noinst_PROGRAMS = ust-basic-tracing
 ust_basic_tracing_SOURCES = ust-basic-tracing.c

diff --git a/tests/ust-multi-test/Makefile.am b/tests/ust-multi-test/Makefile.am
index c1d39d9b9aa33a10afc78a8130f9b1f274feba62..69c7cc93c0bbfd130fad7da89fd143951919cb17 100644 (file)
--- a/tests/ust-multi-test/Makefile.am
+++ b/tests/ust-multi-test/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libust
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/libust
 
 noinst_PROGRAMS = ust-multi-test
 ust_multi_test_SOURCES = ust-multi-test.c