X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=777764fd7750be3e00d32d3c7a823592d48fd1e4;hb=bae1f483e56c99c22892128d6a77d38cacb14275;hp=419561eb1d2bd7499330ca428e95782152a42cde;hpb=c3ba99c2fb06e6ac4e5921f580c26d61afc53917;p=lttng-ust.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 419561eb..777764fd 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,16 +10,27 @@ noinst_HEADERS = \
 	align.h \
 	bitfield.h \
 	bitmap.h \
+	clock.h \
+	creds.h \
 	dynamic-type.h \
-	elf.h \
+	err-ptr.h \
+	events.h \
+	hash.h \
+	jhash.h \
 	logging.h \
 	macros.h \
+	ns.h \
 	patient.h \
+	procname.h \
 	safe-snprintf.h \
-	ustcomm.h
+	tracepoint.h \
+	wait.h
 
 noinst_HEADERS += \
 	compat/dlfcn.h \
+	compat/errno.h \
+	compat/mmap.h \
+	compat/pthread.h \
 	compat/tid.h
 
 # These headers should be moved to the public headers when tested and
@@ -38,19 +49,79 @@ noinst_HEADERS += \
 ###                      ###
 
 noinst_LTLIBRARIES = \
-	msgpack/libmsgpack.la \
-	snprintf/libsnprintf.la \
-	libcommon.la
+	libcounter.la \
+	libcompat.la \
+	libmsgpack.la \
+	libringbuffer.la \
+	libsnprintf.la \
+	libcommon.la \
+	libustcomm.la
+
+# counter
+libcounter_la_SOURCES = \
+	counter/counter-api.h \
+	counter/counter.c \
+	counter/counter-config.h \
+	counter/counter.h \
+	counter/counter-internal.h \
+	counter/counter-types.h \
+	counter/shm.c \
+	counter/shm.h \
+	counter/shm_internal.h \
+	counter/shm_types.h
+
+libcounter_la_LIBADD = -lrt
+
+if ENABLE_NUMA
+libcounter_la_LIBADD += -lnuma
+endif
+
+libcounter_la_CFLAGS = -DUST_COMPONENT="libcounter" $(AM_CFLAGS)
+
+# compat
+libcompat_la_SOURCES = \
+	compat/futex.c \
+	compat/futex.h
 
 # msgpack
-msgpack_libmsgpack_la_SOURCES = \
+libmsgpack_la_SOURCES = \
 	msgpack/msgpack.c \
 	msgpack/msgpack.h
 
-msgpack_libmsgpack_la_CFLAGS = -DUST_COMPONENT="libmsgpack" $(AM_CFLAGS)
+libmsgpack_la_CFLAGS = -DUST_COMPONENT="libmsgpack" $(AM_CFLAGS)
+
+# ringbuffer
+libringbuffer_la_SOURCES = \
+	ringbuffer/api.h \
+	ringbuffer/backend.h \
+	ringbuffer/backend_internal.h \
+	ringbuffer/backend_types.h \
+	ringbuffer/frontend_api.h \
+	ringbuffer/frontend.h \
+	ringbuffer/frontend_internal.h \
+	ringbuffer/frontend_types.h \
+	ringbuffer/nohz.h \
+	ringbuffer/rb-init.h \
+	ringbuffer/ring_buffer_backend.c \
+	ringbuffer/ringbuffer-config.h \
+	ringbuffer/ring_buffer_frontend.c \
+	ringbuffer/shm.c \
+	ringbuffer/shm.h \
+	ringbuffer/shm_internal.h \
+	ringbuffer/shm_types.h \
+	ringbuffer/vatomic.h
+
+libringbuffer_la_LIBADD = \
+	-lrt
+
+if ENABLE_NUMA
+libringbuffer_la_LIBADD += -lnuma
+endif
+
+libringbuffer_la_CFLAGS = -DUST_COMPONENT="libringbuffer" $(AM_CFLAGS)
 
 # snprintf
-snprintf_libsnprintf_la_SOURCES = \
+libsnprintf_la_SOURCES = \
 	snprintf/fflush.c \
 	snprintf/fileext.h \
 	snprintf/floatio.h \
@@ -66,12 +137,27 @@ snprintf_libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+	elf.c \
+	elf.h \
+	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 = \
-	msgpack/libmsgpack.la \
-	snprintf/libsnprintf.la
+	libcompat.la \
+	libmsgpack.la \
+	libsnprintf.la
+
+libustcomm_la_SOURCES = \
+	ustcomm.c \
+	ustcomm.h
 
 EXTRA_DIST = snprintf/README