X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=6ba6c2b59b6c42fb0269680da7bc61323f625783;hp=a8125bc404407c44451297c30ff60f3d370a6775;hb=9fd926379bd4c6c17f2b3c39a5bbf9879bc74e14;hpb=1c39da610b4b1e47a50ab51d9cdfc56d895f2b73

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a8125bc40..6ba6c2b59 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,24 +1,34 @@
-AM_CPPFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
-SUBDIRS = hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
+SUBDIRS = compat hashtable kernel-ctl sessiond-comm relayd \
+		  kernel-consumer ust-consumer testpoint
 
 AM_CFLAGS = -fno-strict-aliasing
 
-noinst_HEADERS = lttng-share.h lttngerr.h lttng-kernel.h
+noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
+				 uri.h utils.h lttng-kernel-old.h \
+				 consumer-metadata-cache.h consumer-timer.h
 
+# Common library
 noinst_LTLIBRARIES = libcommon.la
 
-libcommon_la_SOURCES = runas.c runas.h
+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
+libcommon_la_LIBADD = -luuid
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la
 
-libconsumer_la_SOURCES = consumer.c consumer.h
+libconsumer_la_SOURCES = consumer.c consumer.h consumer-metadata-cache.c \
+                         consumer-timer.c
 
 libconsumer_la_LIBADD = \
 		$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
 		$(top_builddir)/src/common/kernel-consumer/libkernel-consumer.la \
-		$(top_builddir)/src/common/hashtable/libhashtable.la
+		$(top_builddir)/src/common/hashtable/libhashtable.la \
+		$(top_builddir)/src/common/compat/libcompat.la \
+		$(top_builddir)/src/common/relayd/librelayd.la
 
 if HAVE_LIBLTTNG_UST_CTL
 libconsumer_la_LIBADD += \