X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=ed798b3be51751ca9e1b1fa2edf775029459e982;hb=8cd08025a83fe1907c6fd04f94c8f9ae362c3da7;hp=f89dd1c37d6e8e16375614365466bca2f1d539fc;hpb=c5e8ef85e4c09e2f91a226195dc59f8b0bd6fd60;p=lttng-ust.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index f89dd1c3..ed798b3b 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -12,10 +12,9 @@ noinst_HEADERS = \
 	bitmap.h \
 	clock.h \
 	creds.h \
-	dynamic-type.h \
-	elf.h \
 	err-ptr.h \
 	events.h \
+	getcpu.h \
 	hash.h \
 	jhash.h \
 	logging.h \
@@ -24,6 +23,8 @@ noinst_HEADERS = \
 	patient.h \
 	procname.h \
 	safe-snprintf.h \
+	tracepoint.h \
+	tracer.h \
 	wait.h
 
 noinst_HEADERS += \
@@ -50,9 +51,10 @@ noinst_HEADERS += \
 
 noinst_LTLIBRARIES = \
 	libcounter.la \
-	libcompat.la \
+	libcounter-clients.la \
 	libmsgpack.la \
 	libringbuffer.la \
+	libringbuffer-clients.la \
 	libsnprintf.la \
 	libcommon.la \
 	libustcomm.la
@@ -68,9 +70,7 @@ libcounter_la_SOURCES = \
 	counter/shm.c \
 	counter/shm.h \
 	counter/shm_internal.h \
-	counter/shm_types.h \
-	counter/smp.c \
-	counter/smp.h
+	counter/shm_types.h
 
 libcounter_la_LIBADD = -lrt
 
@@ -80,10 +80,14 @@ endif
 
 libcounter_la_CFLAGS = -DUST_COMPONENT="libcounter" $(AM_CFLAGS)
 
-# compat
-libcompat_la_SOURCES = \
-	compat/futex.c \
-	compat/futex.h
+# counter-clients
+libcounter_clients_la_SOURCES = \
+	counter-clients/clients.c \
+	counter-clients/clients.h \
+	counter-clients/percpu-32-modular.c \
+	counter-clients/percpu-64-modular.c
+
+libcounter_clients_la_CFLAGS = -DUST_COMPONENT="libcounter-clients" $(AM_CFLAGS)
 
 # msgpack
 libmsgpack_la_SOURCES = \
@@ -111,8 +115,6 @@ libringbuffer_la_SOURCES = \
 	ringbuffer/shm.h \
 	ringbuffer/shm_internal.h \
 	ringbuffer/shm_types.h \
-	ringbuffer/smp.c \
-	ringbuffer/smp.h \
 	ringbuffer/vatomic.h
 
 libringbuffer_la_LIBADD = \
@@ -124,6 +126,20 @@ endif
 
 libringbuffer_la_CFLAGS = -DUST_COMPONENT="libringbuffer" $(AM_CFLAGS)
 
+# ringbuffer-client
+libringbuffer_clients_la_SOURCES = \
+	ringbuffer-clients/clients.c \
+	ringbuffer-clients/clients.h \
+	ringbuffer-clients/discard.c \
+	ringbuffer-clients/discard-rt.c \
+	ringbuffer-clients/metadata.c \
+	ringbuffer-clients/metadata-template.h \
+	ringbuffer-clients/overwrite.c \
+	ringbuffer-clients/overwrite-rt.c \
+	ringbuffer-clients/template.h
+
+libringbuffer_clients_la_CFLAGS = -DUST_COMPONENT="libringbuffer-clients" $(AM_CFLAGS)
+
 # snprintf
 libsnprintf_la_SOURCES = \
 	snprintf/fflush.c \
@@ -141,14 +157,25 @@ libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+	core.c \
+	dynamic-type.c \
+	dynamic-type.h \
+	elf.c \
+	elf.h \
+	events.c \
 	getenv.c \
 	getenv.h \
 	logging.c \
 	logging.h \
+	smp.c \
+	smp.h \
+	strutils.c \
+	strutils.h \
+	utils.c \
+	utils.h \
 	patient.c
 
 libcommon_la_LIBADD = \
-	libcompat.la \
 	libmsgpack.la \
 	libsnprintf.la