lttng: Split up libtracepoints

Signed-off-by: Adam Crume <adamcrume@gmail.com>

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index a48a644281d5b6ed5e07126d5bf500bf1e7ede54..2ad2f58b147f13dbbe5ebe2df9606c208c83aa66 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -156,7 +156,9 @@ LIBRBD = librbd.la
 LIBKRBD = libkrbd.la
 LIBCEPHFS = libcephfs.la
 LIBERASURE_CODE = liberasure_code.la
-LIBTRACEPOINTS = tracing/libtracepoints.la
+LIBCOMMON_TP = tracing/libcommon_tp.la
+LIBOSD_TP = tracing/libosd_tp.la
+LIBRADOS_TP = tracing/librados_tp.la
 
 if WITH_LIBAIO
 LIBOS += -laio

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 1d290a69f3f1d874de73c4da876edbe3aa966f36..c57a308528c205f1af38f486377fe66123185beb 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -113,7 +113,7 @@ LIBCOMMON_DEPS += \
        $(LIBERASURE_CODE) \
        $(LIBMSG) $(LIBAUTH) \
        $(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
-       $(LIBTRACEPOINTS)
+       $(LIBCOMMON_TP)
 
 if LINUX
 LIBCOMMON_DEPS += -lrt

diff --git a/src/librados/Makefile.am b/src/librados/Makefile.am
index a7d02ad853c8991f87fb2780f97f427a37c8f393..0818aa399cf6c7e7c1b76522397125f6d0b6adf7 100644 (file)
--- a/src/librados/Makefile.am
+++ b/src/librados/Makefile.am
@@ -8,7 +8,7 @@ librados_la_SOURCES = \
 # We need this to avoid basename conflicts with the librados build tests in test/Makefile.am
 librados_la_CXXFLAGS = ${AM_CXXFLAGS}
 
-LIBRADOS_DEPS += libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON)
+LIBRADOS_DEPS += libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON) $(LIBRADOS_TP)
 librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
 librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
 if LINUX

diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index b8dab687c8b64ef0c8c882cc82e7963fa7110c4c..2c930b96146bc82686133ddd81a3f3664c677d59 100644 (file)
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -25,7 +25,7 @@ libosd_la_SOURCES = \
        objclass/class_api.cc
 
 libosd_la_CXXFLAGS = ${AM_CXXFLAGS}
-libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES)
+libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES) $(LIBOSD_TP)
 noinst_LTLIBRARIES += libosd.la
 
 noinst_HEADERS += \

diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am
index cd1cdea52d2e741e33f3b0d9e42cbda9e7b77995..59d48c42dd09db1d0006ec77ae5c5ef2741077c1 100644 (file)
--- a/src/tracing/Makefile.am
+++ b/src/tracing/Makefile.am
@@ -8,22 +8,35 @@ dist_noinst_DATA = \
        osd.tp \
        pg.tp
 
-libtracepoints_la_SOURCES = \
-       librados.c \
-       librados.h \
+libcommon_tp_la_SOURCES = \
        mutex.c \
-       mutex.h \
+       mutex.h
+libcommon_tp_la_LIBADD = -llttng-ust -ldl
+libcommon_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
+libcommon_tp_la_LDFLAGS =
+
+libosd_tp_la_SOURCES = \
        oprequest.c \
        oprequest.h \
        osd.c \
        osd.h \
        pg.h \
        pg.c
+libosd_tp_la_LIBADD = -llttng-ust -ldl
+libosd_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
+libosd_tp_la_LDFLAGS =
+
+librados_tp_la_SOURCES = \
+       librados.c \
+       librados.h
+librados_tp_la_LIBADD = -llttng-ust -ldl
+librados_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
+librados_tp_la_LDFLAGS =
 
-libtracepoints_la_LIBADD = -llttng-ust -ldl
-libtracepoints_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
-libtracepoints_la_LDFLAGS =
-noinst_LTLIBRARIES = libtracepoints.la
+noinst_LTLIBRARIES = \
+       libcommon_tp.la \
+       libosd_tp.la \
+       librados_tp.la
 
 BUILT_SOURCES = \
        librados.h \
@@ -32,4 +45,7 @@ BUILT_SOURCES = \
        osd.h \
        pg.h
 
-CLEANFILES = $(libtracepoints_la_SOURCES)
+CLEANFILES = \
+       $(libcommon_tp_la_SOURCES) \
+       $(libosd_tp_la_SOURCES) \
+       $(librados_tp_la_SOURCES)