X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=4b1484e8be637c8bee849e0a2cc0bf43d918410d;hp=b9d344b88a59bd2616269ce7500da1cf480e5dea;hb=2c5ff4e47394f9588ac1a0ab50e8fbdf36727cbe;hpb=76fcf15156ecb0a18f9c41b350342171f862ff47

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b9d344b88..4b1484e8b 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -12,12 +12,12 @@ DIST_SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \
 noinst_LTLIBRARIES = libcommon.la
 EXTRA_DIST = mi-lttng-3.0.xsd
 
-libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.h \
+libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.h runas.c \
                        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.h \
+                       unix.c unix.h \
                        filter.c filter.h context.c context.h \
                        action.c notify.c condition.c buffer-usage.c \
                        session-consumed-size.c \
@@ -27,24 +27,20 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.h \
                        buffer-view.h buffer-view.c \
                        location.c \
                        waiter.h waiter.c \
-                       userspace-probe.c event.c
+                       userspace-probe.c event.c time.c \
+                       session-descriptor.c credentials.h \
+                       trace-chunk.c trace-chunk.h trace-chunk-registry.h \
+                       dynamic-array.h dynamic-array.c optional.h
+
+if HAVE_ELF_H
+libcommon_la_SOURCES += lttng-elf.h lttng-elf.c
+endif
 
 libcommon_la_LIBADD = \
 		$(top_builddir)/src/common/config/libconfig.la \
+		$(top_builddir)/src/common/compat/libcompat.la \
 		$(UUID_LIBS)
 
-if BUILD_LIB_RUNAS
-libcommon_la_SOURCES += runas.c lttng-elf.h lttng-elf.c
-else
-libcommon_la_SOURCES += runas-stub.c
-endif
-
-if BUILD_LIB_UNIX
-libcommon_la_SOURCES += unix.c
-else
-libcommon_la_SOURCES += unix-stub.c
-endif
-
 if BUILD_LIB_COMPAT
 SUBDIRS += compat
 endif
@@ -95,7 +91,7 @@ endif
 
 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 time.h
+				 align.h bug.h time.h
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \