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 <mathieu.desnoyers@efficios.com>

diff --git a/libringbuffer/Makefile.am b/libringbuffer/Makefile.am
index 2fe76816b4964d850cb6251272a337c0bb01d617..9cd8c2699211c6c5c7bcde9c22d9816d2c345001 100644 (file)
--- 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 676ae2ef49525781523eb80cceb14da47b8508c7..0a0a2f08610d7ea288655e6440e81f898e345424 100644 (file)
--- 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 5148d547151e45cc025ec8b475a4ea379219915d..c1d39d9b9aa33a10afc78a8130f9b1f274feba62 100644 (file)
--- 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