Move getcpu.h to 'lib/lttng-ust/'

[lttng-ust.git] / src / common / Makefile.am

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 2fbc8fffacf2db9242493bec043134613e08e9ff..2ab4bfdc6271e63c0fdf37050b87df8f16e4a4af 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,16 +10,21 @@ noinst_HEADERS = \
        align.h \
        bitfield.h \
        bitmap.h \
+       clock.h \
        dynamic-type.h \
        elf.h \
        logging.h \
        macros.h \
        patient.h \
+       procname.h \
        safe-snprintf.h \
-       ustcomm.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 +44,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 = \
@@ -68,11 +74,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 +90,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 \
@@ -109,7 +113,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 \
@@ -130,7 +134,11 @@ libcommon_la_SOURCES = \
        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