X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=ce427655fc82dc003cc3daed3ce33a7a22f0ed97;hb=810185f3a90e717e2a482b4555f90f4d4f6d7bbf;hp=fdbbc05c7bd4cf7188cfd6701eee7d6473dc9aff;hpb=67534785e151f4c78aa5697703c55c5193deb65c;p=lttng-ust.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index fdbbc05c..ce427655 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,15 +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 \
-	safe-snprintf.h
+	procname.h \
+	safe-snprintf.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,9 +50,10 @@ noinst_HEADERS += \
 
 noinst_LTLIBRARIES = \
 	libcounter.la \
-	msgpack/libmsgpack.la \
+	libcompat.la \
+	libmsgpack.la \
 	libringbuffer.la \
-	snprintf/libsnprintf.la \
+	libsnprintf.la \
 	libcommon.la \
 	libustcomm.la
 
@@ -55,9 +68,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
 
@@ -67,12 +78,17 @@ 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 = \
@@ -84,8 +100,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 +109,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 +121,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,13 +137,25 @@ snprintf_libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+	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
+	libcompat.la \
+	libmsgpack.la \
+	libsnprintf.la
 
 libustcomm_la_SOURCES = \
 	ustcomm.c \