X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=d85cf60273120969d7a69015c3e33484c21e1eed;hb=53b9d7db85d4fafa5b8044a474bb84b8d80966ad;hp=156552806943705c954031931ea2fd888596079f;hpb=6be9efc138f42a3247b242198d0284dfedb67a59;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 15655280..d85cf602 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
 
@@ -14,8 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
-	-lpthread \
+	$(URCU_BP_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -33,6 +31,20 @@ 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 \
@@ -49,6 +61,7 @@ liblttng_ust_runtime_la_SOURCES = \
 	ust_lib.c \
 	ust_lib.h \
 	tracepoint-internal.h \
+	ust-events-internal.h \
 	clock.h \
 	compat.h \
 	wait.h \
@@ -61,7 +74,9 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-tracelog-provider.h \
 	getenv.h \
 	string-utils.c \
-	string-utils.h
+	string-utils.h \
+	ns.h \
+	creds.h
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -94,9 +109,8 @@ 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 \