Move liblttng-ust-common to 'src/lib/'

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

diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am
index aafcbd5f89775497635f78029cb087674f17b29e..5fcfb5f54ffcf1a568e19049c4e2e7558ae84192 100644 (file)
--- a/src/lib/lttng-ust/Makefile.am
+++ b/src/lib/lttng-ust/Makefile.am
@@ -4,19 +4,7 @@ AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
-lib_LTLIBRARIES = liblttng-ust-common.la liblttng-ust-tracepoint.la liblttng-ust.la
-
-# 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)
+lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
 
 liblttng_ust_tracepoint_la_SOURCES = \
        tracepoint.c \
@@ -25,7 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
        lttng-tracer-core.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-       liblttng-ust-common.la \
+       $(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \
        $(top_builddir)/src/common/libcommon.la \
        $(DL_LIBS)
 
@@ -65,7 +53,6 @@ liblttng_ust_runtime_la_SOURCES = \
        lttng-context-vsgid.c \
        lttng-context.c \
        lttng-events.c \
-       lttng-hash-helper.h \
        lttng-ust-elf.c \
        lttng-ust-elf.h \
        lttng-ust-statedump.c \
@@ -83,10 +70,7 @@ liblttng_ust_runtime_la_SOURCES = \
        lttng-ust-tracef-provider.h \
        tracelog.c \
        lttng-ust-tracelog-provider.h \
-       string-utils.c \
-       string-utils.h \
        event-notifier-notification.c \
-       ns.h \
        rculfhash.c \
        rculfhash.h \
        rculfhash-internal.h \
@@ -129,7 +113,7 @@ liblttng_ust_support_la_LIBADD = \
 
 liblttng_ust_la_LIBADD = \
        -lrt \
-       liblttng-ust-common.la \
+       $(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \
        $(top_builddir)/src/common/libustcomm.la \
        $(top_builddir)/src/common/libcommon.la \
        liblttng-ust-tracepoint.la \