X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=5d79210b802819cd07e14e5b11338c16acfdca09;hb=731bc74aa3b64796616f2da9a65ccfcf72629bf5;hp=e9ec3db82b0b18a2e107c500aea33e55eed55c9b;hpb=db7586006bc1a2b9057a2c108bf1e7d20fd6903f;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e9ec3db82..5d79210b8 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,10 +1,10 @@
 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 = lttng-kernel.h defaults.h macros.h
+noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h
 
 noinst_LTLIBRARIES = libcommon.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)