Cleanup: standardise include path

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

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 1f167218af985bcdf6d71d67e152bd6895fd3ef0..169db3298f4310aae4489b64674276b59139fc62 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
 
@@ -15,7 +14,6 @@ liblttng_ust_tracepoint_la_SOURCES = \
 
 liblttng_ust_tracepoint_la_LIBADD = \
        -lurcu-bp \
-       -lpthread \
        $(top_builddir)/snprintf/libustsnprintf.la \
        $(DL_LIBS)
 
@@ -38,8 +36,15 @@ 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 \
+       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 \
@@ -69,7 +74,8 @@ liblttng_ust_runtime_la_SOURCES = \
        getenv.h \
        string-utils.c \
        string-utils.h \
-       ns.h
+       ns.h \
+       creds.h
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -102,7 +108,6 @@ liblttng_ust_support_la_LIBADD = \
        $(top_builddir)/libringbuffer/libringbuffer.la
 
 liblttng_ust_la_LIBADD = \
-       -lpthread \
        -lrt \
        -lurcu-cds \
        $(top_builddir)/snprintf/libustsnprintf.la \