X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=5b716129cf96156961b666f12dde0913dcd8e211;hp=8454b5a51562ca30041c8f9367906c73500dc92b;hb=2682143146614b3b1bd025393bafde9c843797c7;hpb=309167d2a6f59d0c8cbf64eb23ba912cdea76a34

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 8454b5a51..5b716129c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,21 +1,32 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
-SUBDIRS = compat hashtable kernel-ctl sessiond-comm relayd \
-		  kernel-consumer ust-consumer testpoint index
+AUTOMAKE_OPTIONS = subdir-objects
+
+SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \
+		  kernel-consumer ust-consumer testpoint index config
 
 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 \
-				 consumer-metadata-cache.h consumer-timer.h
+				 consumer-metadata-cache.h consumer-timer.h \
+				 consumer-testpoint.h align.h bitfield.h bug.h
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
+EXTRA_DIST = mi_lttng.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
-libcommon_la_LIBADD = -luuid
+                       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
+
+libcommon_la_LIBADD = \
+		-luuid \
+		-lrt \
+		$(top_builddir)/src/common/config/libconfig.la
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la
@@ -34,3 +45,17 @@ if HAVE_LIBLTTNG_UST_CTL
 libconsumer_la_LIBADD += \
 		$(top_builddir)/src/common/ust-consumer/libust-consumer.la
 endif
+
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+		cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
+
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+		rm -f $(builddir)/$$script; \
+		done; \
+	fi