X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=460f2a2de989bc65605f25ba67eb7102245191d4;hb=f37d259d342af1ff8855d9eaa578cb7a3cfcc4f2;hp=ade89de867914de7e5fcc0a596559161464ff5ac;hpb=990570edd474b304d4c935d82be6201d872025e4;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ade89de86..460f2a2de 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,14 +1,14 @@
 AM_CPPFLAGS =
 
-SUBDIRS = hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
+SUBDIRS = compat hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
 
 AM_CFLAGS = -fno-strict-aliasing
 
-noinst_HEADERS = lttngerr.h lttng-kernel.h defaults.h macros.h
+noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h
 
 noinst_LTLIBRARIES = libcommon.la
 
-libcommon_la_SOURCES = runas.c runas.h common.h
+libcommon_la_SOURCES = runas.c runas.h common.h futex.c futex.h
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la
@@ -18,19 +18,10 @@ libconsumer_la_SOURCES = consumer.c consumer.h
 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
 
 if HAVE_LIBLTTNG_UST_CTL
 libconsumer_la_LIBADD += \
 		$(top_builddir)/src/common/ust-consumer/libust-consumer.la
 endif
-
-if COMPAT_EPOLL
-COMPAT=compat/compat-epoll.c
-else
-COMPAT=compat/compat-poll.c
-endif
-
-noinst_LTLIBRARIES += libcompat.la
-
-libcompat_la_SOURCES = compat/poll.h $(COMPAT)