X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=98fb2153d3ebafdbe49c67da8f4ebb8c3bb7308e;hb=51f804ec315888553a0104fe691af89216c127e8;hp=57df3aedc9b3f04ad57c6530994e9a61609f2e57;hpb=ab12eb57cf3fdd2c25df16a3d1e770a2642b93e8;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 57df3aed..98fb2153 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
@@ -12,24 +11,25 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	lttng-tracer-core.h \
 	jhash.h \
 	error.h
+
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
-	-lpthread \
-	$(top_builddir)/snprintf/libustsnprintf.la
+	$(URCU_BP_LIBS) \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(DL_LIBS)
+
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_tracepoint_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_tracepoint_la_LIBADD += -lc
-endif
-
 liblttng_ust_runtime_la_SOURCES = \
+	bytecode.h \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
 	lttng-probes.c \
+	lttng-bytecode.c \
+	lttng-bytecode.h \
+	lttng-bytecode-validator.c \
+	lttng-bytecode-specialize.c \
+	lttng-bytecode-interpreter.c \
 	lttng-context-provider.c \
 	lttng-context-vtid.c \
 	lttng-context-vpid.c \
@@ -37,14 +37,22 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-procname.c \
 	lttng-context-ip.c \
 	lttng-context-cpu-id.c \
+	lttng-context-cgroup-ns.c \
+	lttng-context-ipc-ns.c \
+	lttng-context-mnt-ns.c \
+	lttng-context-net-ns.c \
+	lttng-context-pid-ns.c \
+	lttng-context-time-ns.c \
+	lttng-context-user-ns.c \
+	lttng-context-uts-ns.c \
+	lttng-context-vuid.c \
+	lttng-context-veuid.c \
+	lttng-context-vsuid.c \
+	lttng-context-vgid.c \
+	lttng-context-vegid.c \
+	lttng-context-vsgid.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 \
@@ -52,7 +60,10 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-statedump-provider.h \
 	ust_lib.c \
 	ust_lib.h \
+	context-internal.h \
+	context-provider-internal.h \
 	tracepoint-internal.h \
+	ust-events-internal.h \
 	clock.h \
 	compat.h \
 	wait.h \
@@ -65,9 +76,10 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-tracelog-provider.h \
 	getenv.h \
 	string-utils.c \
-	string-utils.h
-
-liblttng_ust_runtime_la_CFLAGS = -DLTTNG_UST_LIBRARY_VERSION_MAJOR=\"$(LTTNG_UST_LIBRARY_VERSION_MAJOR)\"
+	string-utils.h \
+	event-notifier-notification.c \
+	ns.h \
+	creds.h
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -100,19 +112,13 @@ liblttng_ust_support_la_LIBADD = \
 	$(top_builddir)/libringbuffer/libringbuffer.la
 
 liblttng_ust_la_LIBADD = \
-	-lpthread \
 	-lrt \
-	-lurcu-cds \
+	$(URCU_CDS_LIBS) \
 	$(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_LIBDL
-liblttng_ust_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_la_LIBADD += -lc
-endif
+	liblttng-ust-runtime.la liblttng-ust-support.la \
+	$(top_builddir)/libmsgpack/libmsgpack.la \
+	$(DL_LIBS)
 
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)