X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=1f167218af985bcdf6d71d67e152bd6895fd3ef0;hb=735bef4705cc42f25d26f25be09ba98f1efb8511;hp=57df3aedc9b3f04ad57c6530994e9a61609f2e57;hpb=ab12eb57cf3fdd2c25df16a3d1e770a2642b93e8;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 57df3aed..1f167218 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -12,20 +12,16 @@ 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
+	$(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 = \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
@@ -37,6 +33,13 @@ 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-user-ns.c \
+	lttng-context-uts-ns.c \
 	lttng-context.c \
 	lttng-events.c \
 	lttng-filter.c \
@@ -65,9 +68,8 @@ 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 \
+	ns.h
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -106,13 +108,7 @@ liblttng_ust_la_LIBADD = \
 	$(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 \
+	$(DL_LIBS)
 
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)