X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=36cb9a25038f0d871f40577bf5c40afc6b4f0f3e;hb=dc58067e5a8b6717acd5c2d9031755aeb67e7cc1;hp=fe474f722376126d4d41ef066d0a7ff79e5d50e6;hpb=b728d87e617189fe9898a9492a559ecf949d2348;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index fe474f72..36cb9a25 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,9 +1,23 @@
-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
 
-lib_LTLIBRARIES = liblttng-ust.la
+lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
+
+liblttng_ust_tracepoint_la_SOURCES = \
+	tracepoint.c \
+	tracepoint-internal.h \
+	ltt-tracer-core.h \
+	jhash.h \
+	error.h
+liblttng_ust_tracepoint_la_LIBADD = \
+	-lurcu-bp \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	liblttng-ust-support.la
+
+liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
+liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
 
 liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-comm.c \
@@ -17,10 +31,13 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-procname.c \
 	ltt-context.c \
 	ltt-events.c \
-	tracepoint.c \
 	tracepoint-internal.h \
 	clock.h \
-	wait.h
+	compat.h \
+	wait.h \
+	jhash.h \
+	error.h \
+	lttng-ust-uuid.h
 
 liblttng_ust_support_la_SOURCES = \
 	ltt-tracer.h \
@@ -34,7 +51,7 @@ liblttng_ust_support_la_SOURCES = \
 
 liblttng_ust_la_SOURCES =
 
-liblttng_ust_la_LDFLAGS = -no-undefined -version-info 0:0:0
+liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
 liblttng_ust_support_la_LIBADD = \
 	$(top_builddir)/libringbuffer/libringbuffer.la
@@ -42,9 +59,16 @@ liblttng_ust_support_la_LIBADD = \
 liblttng_ust_la_LIBADD = \
 	-lpthread \
 	-lrt \
-	-luuid \
+	-llttng-ust-tracepoint \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la
 
-liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng-ust" -fno-strict-aliasing
+if LTTNG_UST_BUILD_WITH_LIBUUID
+liblttng_ust_la_LIBADD += -luuid
+endif
+if LTTNG_UST_BUILD_WITH_LIBC_UUID
+liblttng_ust_la_LIBADD += -lc
+endif
+
+liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing