X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=e79591a838f9ac9612356aed41fb7856c9edeb4e;hb=6f626d284c2bb02ae8980da6e8053e191d604286;hp=eae0b33101649589296357f56f1401b0734f7bd0;hpb=2d78951a159c97fd2bfebb84a9b22ef97674d56a;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index eae0b331..e79591a8 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
@@ -7,45 +7,81 @@ lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
 
 liblttng_ust_tracepoint_la_SOURCES = \
 	tracepoint.c \
+	tracepoint-weak-test.c \
 	tracepoint-internal.h \
-	ltt-tracer-core.h \
+	lttng-tracer-core.h \
 	jhash.h \
 	error.h
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp
+	-lurcu-bp \
+	-lpthread \
+	$(top_builddir)/snprintf/libustsnprintf.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 \
 	lttng-ust-abi.c \
-	ltt-probes.c \
-	probes/lttng-probe-ust.c \
-	probes/lttng-probe-ust.h \
+	lttng-probes.c \
+	lttng-context-provider.c \
 	lttng-context-vtid.c \
 	lttng-context-vpid.c \
 	lttng-context-pthread-id.c \
 	lttng-context-procname.c \
-	ltt-context.c \
-	ltt-events.c \
+	lttng-context-ip.c \
+	lttng-context-cpu-id.c \
+	lttng-context.c \
+	lttng-events.c \
 	lttng-filter.c \
+	lttng-filter.h \
+	lttng-filter-validator.c \
+	lttng-filter-specialize.c \
+	lttng-filter-interpreter.c \
+	filter-bytecode.h \
+	lttng-hash-helper.h \
+	lttng-ust-elf.c \
+	lttng-ust-statedump.c \
+	lttng-ust-statedump.h \
+	lttng-ust-statedump-provider.h \
+	ust_lib.c \
+	ust_lib.h \
 	tracepoint-internal.h \
 	clock.h \
 	compat.h \
 	wait.h \
 	jhash.h \
+	lttng-ust-uuid.h \
 	error.h \
-	lttng-ust-uuid.h
+	tracef.c \
+	lttng-ust-tracef-provider.h \
+	tracelog.c \
+	lttng-ust-tracelog-provider.h \
+	getenv.h \
+	string-utils.c \
+	string-utils.h
+
+if HAVE_PERF_EVENT
+liblttng_ust_runtime_la_SOURCES += \
+	lttng-context-perf-counters.c \
+	perf_event.h
+endif
 
 liblttng_ust_support_la_SOURCES = \
-	ltt-tracer.h \
-	ltt-tracer-core.h \
+	lttng-tracer.h \
+	lttng-tracer-core.h \
 	ust-core.c \
-	ltt-ring-buffer-client.h \
-	ltt-ring-buffer-client-discard.c \
-	ltt-ring-buffer-client-overwrite.c \
-	ltt-ring-buffer-metadata-client.h \
-	ltt-ring-buffer-metadata-client.c
+	getenv.h \
+	getenv.c \
+	lttng-ust-dynamic-type.c \
+	lttng-rb-clients.h \
+	lttng-ring-buffer-client.h \
+	lttng-ring-buffer-client-discard.c \
+	lttng-ring-buffer-client-discard-rt.c \
+	lttng-ring-buffer-client-overwrite.c \
+	lttng-ring-buffer-client-overwrite-rt.c \
+	lttng-ring-buffer-metadata-client.h \
+	lttng-ring-buffer-metadata-client.c \
+	lttng-clock.c lttng-getcpu.c
 
 liblttng_ust_la_SOURCES =
 
@@ -57,16 +93,11 @@ liblttng_ust_support_la_LIBADD = \
 liblttng_ust_la_LIBADD = \
 	-lpthread \
 	-lrt \
-	-llttng-ust-tracepoint \
+	-lurcu-cds \
+	-ldl \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
+	liblttng-ust-tracepoint.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la
 
-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