From: Mathieu Desnoyers Date: Wed, 19 Oct 2011 00:03:03 +0000 (-0400) Subject: Do not install libringbuffer into system X-Git-Tag: v1.9.1~169 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d672b30f45079019d516dd7fe042b60a248c13a5;p=lttng-ust.git Do not install libringbuffer into system This is not meant to be a stable API. We'll provide a convenient wrapper over it instead. Signed-off-by: Mathieu Desnoyers --- diff --git a/libringbuffer/Makefile.am b/libringbuffer/Makefile.am index 2fe76816..9cd8c269 100644 --- a/libringbuffer/Makefile.am +++ b/libringbuffer/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -fno-strict-aliasing -lib_LTLIBRARIES = libringbuffer.la +noinst_LTLIBRARIES = libringbuffer.la noinst_HEADERS = \ smp.h @@ -16,7 +16,6 @@ libringbuffer_la_LDFLAGS = -no-undefined -version-info 0:0:0 libringbuffer_la_LIBADD = \ -lpthread \ - -lrt \ - $(top_builddir)/snprintf/libustsnprintf.la + -lrt libringbuffer_la_CFLAGS = -DUST_COMPONENT="libringbuffer" -fno-strict-aliasing diff --git a/tests/ust-basic-tracing/Makefile.am b/tests/ust-basic-tracing/Makefile.am index 676ae2ef..0a0a2f08 100644 --- a/tests/ust-basic-tracing/Makefile.am +++ b/tests/ust-basic-tracing/Makefile.am @@ -3,4 +3,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libust noinst_PROGRAMS = ust-basic-tracing ust_basic_tracing_SOURCES = ust-basic-tracing.c ust_basic_tracing_LDADD = $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ - $(top_builddir)/libringbuffer/libringbuffer.la + $(top_builddir)/libringbuffer/libringbuffer.la \ + $(top_builddir)/snprintf/libustsnprintf.la diff --git a/tests/ust-multi-test/Makefile.am b/tests/ust-multi-test/Makefile.am index 5148d547..c1d39d9b 100644 --- a/tests/ust-multi-test/Makefile.am +++ b/tests/ust-multi-test/Makefile.am @@ -3,4 +3,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libust noinst_PROGRAMS = ust-multi-test ust_multi_test_SOURCES = ust-multi-test.c ust_multi_test_LDADD = $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ - $(top_builddir)/libringbuffer/libringbuffer.la + $(top_builddir)/libringbuffer/libringbuffer.la \ + $(top_builddir)/snprintf/libustsnprintf.la