-if HAVE_LIBLTTNG_UST_CTL
-libconsumer_la_LIBADD += \
- $(top_builddir)/src/common/ust-consumer/libust-consumer.la
+# Common library
+noinst_LTLIBRARIES = libcommon.la
+EXTRA_DIST = mi-lttng-3.0.xsd
+
+libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
+ common.h futex.c futex.h uri.c uri.h defaults.c \
+ pipe.c pipe.h readwrite.c readwrite.h \
+ mi-lttng.h mi-lttng.c \
+ daemonize.c daemonize.h \
+ unix.c unix.h \
+ filter.c filter.h context.c context.h \
+ action.c notify.c condition.c buffer-usage.c \
+ evaluation.c notification.c trigger.c endpoint.c \
+ dynamic-buffer.h dynamic-buffer.c \
+ buffer-view.h buffer-view.c
+
+libcommon_la_LIBADD = \
+ $(top_builddir)/src/common/config/libconfig.la
+if LTTNG_BUILD_WITH_LIBUUID
+libcommon_la_LIBADD += -luuid