From 9d9d9767f7e2cbc25682f77aad0b06e3c63e54c8 Mon Sep 17 00:00:00 2001 From: Paul Chavent Date: Tue, 2 Oct 2012 12:37:30 -0400 Subject: [PATCH] Build out of src tree Signed-off-by: Mathieu Desnoyers --- liblttng-ust-ctl/Makefile.am | 2 +- liblttng-ust-libc-wrapper/Makefile.am | 2 +- liblttng-ust/Makefile.am | 2 +- libringbuffer/Makefile.am | 4 ++-- tests/demo/Makefile.am | 2 +- tests/fork/Makefile.am | 2 +- tests/hello-static-lib/Makefile.am | 2 +- tests/hello.cxx/Makefile.am | 2 +- tests/hello/Makefile.am | 2 +- tests/ust-basic-tracing/Makefile.am | 2 +- tests/ust-multi-test/Makefile.am | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/liblttng-ust-ctl/Makefile.am b/liblttng-ust-ctl/Makefile.am index 4e341be7..1a57fef8 100644 --- 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 6220f76c..159e7df5 100644 --- 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 9d9477b9..04b9ff3f 100644 --- 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 b5b0ebd1..271c8bee 100644 --- 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 f96980ed..04b6e8c9 100644 --- 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 48b3da28..c0a3c868 100644 --- 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 0eff080c..c51d5310 100644 --- 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 3e84796a..86f2c43f 100644 --- 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 d866b6da..28ab4106 100644 --- 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 0a0a2f08..175adc85 100644 --- 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 c1d39d9b..69c7cc93 100644 --- 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 -- 2.34.1