Move libustcomm to 'src/common/'

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

diff --git a/src/liblttng-ust/Makefile.am b/src/liblttng-ust/Makefile.am
index 89fba09ab9fc1d4963aea52402c56f2da285d884..d064fad6b3415940a55eb069385c75f3c2429cbc 100644 (file)
--- a/src/liblttng-ust/Makefile.am
+++ b/src/liblttng-ust/Makefile.am
@@ -8,9 +8,14 @@ lib_LTLIBRARIES = liblttng-ust-common.la liblttng-ust-tracepoint.la liblttng-ust
 
 # ust-common
 liblttng_ust_common_la_SOURCES = \
+       fd-tracker.c \
+       ust-common.c \
        lttng-ust-urcu.c \
        lttng-ust-urcu-pointer.c
 
+liblttng_ust_common_la_LIBADD = \
+       $(top_builddir)/src/common/libcommon.la
+
 liblttng_ust_common_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
 liblttng_ust_tracepoint_la_SOURCES = \
@@ -130,14 +135,14 @@ liblttng_ust_la_SOURCES =
 liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
 liblttng_ust_support_la_LIBADD = \
-       $(top_builddir)/src/libringbuffer/libringbuffer.la \
+       $(top_builddir)/src/common/libringbuffer.la \
        $(top_builddir)/src/common/libcounter.la
 
 liblttng_ust_la_LIBADD = \
        -lrt \
        liblttng-ust-common.la \
+       $(top_builddir)/src/common/libustcomm.la \
        $(top_builddir)/src/common/libcommon.la \
-       $(top_builddir)/src/liblttng-ust-comm/liblttng-ust-comm.la \
        liblttng-ust-tracepoint.la \
        liblttng-ust-runtime.la liblttng-ust-support.la \
        $(DL_LIBS)