X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=4692e24c5329f89421d9591571fad71af64c4469;hb=f73bcf5eafdc10b2bbb32de0bcef709de0f8f5e5;hp=2fbc8fffacf2db9242493bec043134613e08e9ff;hpb=e4db8f987126e1c1e586e5ae1e1ba73d0ab43438;p=lttng-ust.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 2fbc8fff..4692e24c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,16 +10,27 @@ noinst_HEADERS = \
 	align.h \
 	bitfield.h \
 	bitmap.h \
-	dynamic-type.h \
-	elf.h \
+	clock.h \
+	creds.h \
+	err-ptr.h \
+	events.h \
+	getcpu.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
@@ -39,10 +50,11 @@ noinst_HEADERS += \
 
 noinst_LTLIBRARIES = \
 	libcounter.la \
-	msgpack/libmsgpack.la \
+	libmsgpack.la \
 	libringbuffer.la \
-	snprintf/libsnprintf.la \
-	libcommon.la
+	libsnprintf.la \
+	libcommon.la \
+	libustcomm.la
 
 # counter
 libcounter_la_SOURCES = \
@@ -55,9 +67,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
 
@@ -68,11 +78,11 @@ endif
 libcounter_la_CFLAGS = -DUST_COMPONENT="libcounter" $(AM_CFLAGS)
 
 # 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 = \
@@ -84,8 +94,6 @@ libringbuffer_la_SOURCES = \
 	ringbuffer/frontend.h \
 	ringbuffer/frontend_internal.h \
 	ringbuffer/frontend_types.h \
-	ringbuffer/getcpu.h \
-	ringbuffer/mmap.h \
 	ringbuffer/nohz.h \
 	ringbuffer/rb-init.h \
 	ringbuffer/ring_buffer_backend.c \
@@ -95,8 +103,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 = \
@@ -109,7 +115,7 @@ 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 \
@@ -125,12 +131,29 @@ snprintf_libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+	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 = \
-	msgpack/libmsgpack.la \
-	snprintf/libsnprintf.la
+	libmsgpack.la \
+	libsnprintf.la
+
+libustcomm_la_SOURCES = \
+	ustcomm.c \
+	ustcomm.h
 
 EXTRA_DIST = snprintf/README