Abstract base `lttng_enabler` to support other types of enablers

[lttng-ust.git] / liblttng-ust / Makefile.am

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index abb7a8dc4154166f85ffb4c40e2c5239b89cbe49..d85cf60273120969d7a69015c3e33484c21e1eed 100644 (file)
--- 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)
 
@@ -38,6 +36,7 @@ liblttng_ust_runtime_la_SOURCES = \
        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 \
@@ -62,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 \
@@ -109,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 \