X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2FMakefile.am;h=c3a947aaaf61094bdf98298dfabd8d92db81222a;hb=ffe600149a7608221985751e1bf293234bf2545c;hp=460f2a2de989bc65605f25ba67eb7102245191d4;hpb=50c8f4840cc0cf140c760159c8705592d6b434ea;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 460f2a2de..c3a947aaa 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,14 +1,19 @@
-AM_CPPFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
-SUBDIRS = compat 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-kernel.h defaults.h macros.h error.h futex.h
+noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
+				 uri.h utils.h lttng-kernel-old.h
 
+# Common library
 noinst_LTLIBRARIES = libcommon.la
 
-libcommon_la_SOURCES = runas.c runas.h common.h futex.c futex.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
+libcommon_la_LIBADD = -luuid
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la
@@ -19,7 +24,8 @@ 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/compat/libcompat.la
+		$(top_builddir)/src/common/compat/libcompat.la \
+		$(top_builddir)/src/common/relayd/librelayd.la
 
 if HAVE_LIBLTTNG_UST_CTL
 libconsumer_la_LIBADD += \