X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=2cf497262fff100db47e2ca35d66add1ddbe955e;hb=23c910e54c8399aceb95704cb2ae1dc5cc981001;hp=148130177f177d2be79fd0e99c638d64b3da6b54;hpb=87fb9fc050f23e78010cb5ba6ce8c1547629aee9;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 148130177..2cf497262 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,12 +2,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS =
+SUBDIRS = string-utils
 
 # Make sure to always distribute all folders
 # since SUBDIRS is decided at configure time.
 DIST_SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \
-	  kernel-consumer ust-consumer testpoint index config consumer
+	  kernel-consumer ust-consumer testpoint index config consumer \
+	  string-utils
 
 if BUILD_LIB_COMPAT
 SUBDIRS += compat
@@ -61,23 +62,32 @@ AM_CFLAGS = -fno-strict-aliasing
 
 noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
 				 uri.h utils.h lttng-kernel-old.h \
-				 align.h bitfield.h bug.h
+				 align.h bitfield.h bug.h time.h
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi_lttng.xsd
+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 \
-                       sessiond-comm/unix.c sessiond-comm/unix.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 = \
-		-luuid \
-		-lrt \
 		$(top_builddir)/src/common/config/libconfig.la
+if LTTNG_BUILD_WITH_LIBUUID
+libcommon_la_LIBADD += -luuid
+endif
+if LTTNG_BUILD_WITH_LIBC_UUID
+libcommon_la_LIBADD += -lc
+endif
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \