Fix: liblttng-ust-fork Makefile flags mismatch

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

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 9ec0591549bbd2627b0c613adb7b4f36314f2dcf..b83f505c38c0402188eecacb2ce5ee08629a2ee0 100644 (file)
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
@@ -8,31 +8,34 @@ lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
 liblttng_ust_tracepoint_la_SOURCES = \
        tracepoint.c \
        tracepoint-internal.h \
-       ltt-tracer-core.h \
+       lttng-tracer-core.h \
        jhash.h \
        error.h
 liblttng_ust_tracepoint_la_LIBADD = \
-       -lurcu-bp
+       -lurcu-bp \
+       $(top_builddir)/snprintf/libustsnprintf.la
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
 
 liblttng_ust_runtime_la_SOURCES = \
        lttng-ust-comm.c \
        lttng-ust-abi.c \
-       ltt-probes.c \
+       lttng-probes.c \
        probes/lttng-probe-ust.c \
        probes/lttng-probe-ust.h \
        lttng-context-vtid.c \
        lttng-context-vpid.c \
        lttng-context-pthread-id.c \
        lttng-context-procname.c \
-       ltt-context.c \
-       ltt-events.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 \
        tracepoint-internal.h \
        clock.h \
        compat.h \
@@ -42,14 +45,14 @@ liblttng_ust_runtime_la_SOURCES = \
        lttng-ust-uuid.h
 
 liblttng_ust_support_la_SOURCES = \
-       ltt-tracer.h \
-       ltt-tracer-core.h \
+       lttng-tracer.h \
+       lttng-tracer-core.h \
        ust-core.c \
-       ltt-ring-buffer-client.h \
-       ltt-ring-buffer-client-discard.c \
-       ltt-ring-buffer-client-overwrite.c \
-       ltt-ring-buffer-metadata-client.h \
-       ltt-ring-buffer-metadata-client.c
+       lttng-ring-buffer-client.h \
+       lttng-ring-buffer-client-discard.c \
+       lttng-ring-buffer-client-overwrite.c \
+       lttng-ring-buffer-metadata-client.h \
+       lttng-ring-buffer-metadata-client.c
 
 liblttng_ust_la_SOURCES =
 
@@ -61,6 +64,7 @@ liblttng_ust_support_la_LIBADD = \
 liblttng_ust_la_LIBADD = \
        -lpthread \
        -lrt \
+       -lurcu-cds \
        -llttng-ust-tracepoint \
        $(top_builddir)/snprintf/libustsnprintf.la \
        $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \