Move lttng-hash-helper.h to 'src/common/'

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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index fa2a9da87a491cb1a7cdb586bba2816684c96f00..15aba9b5afae87d89cbccedf836f7a3d1c69e8d8 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,13 +10,20 @@ 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 \
        patient.h \
        procname.h \
-       safe-snprintf.h
+       safe-snprintf.h \
+       wait.h
 
 noinst_HEADERS += \
        compat/dlfcn.h \
@@ -42,9 +49,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
 
@@ -71,12 +79,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 = \
@@ -88,7 +101,6 @@ libringbuffer_la_SOURCES = \
        ringbuffer/frontend.h \
        ringbuffer/frontend_internal.h \
        ringbuffer/frontend_types.h \
-       ringbuffer/getcpu.h \
        ringbuffer/nohz.h \
        ringbuffer/rb-init.h \
        ringbuffer/ring_buffer_backend.c \
@@ -112,7 +124,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 \
@@ -128,13 +140,16 @@ snprintf_libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+       getenv.c \
+       getenv.h \
        logging.c \
        logging.h \
        patient.c
 
 libcommon_la_LIBADD = \
-       msgpack/libmsgpack.la \
-       snprintf/libsnprintf.la
+       libcompat.la \
+       libmsgpack.la \
+       libsnprintf.la
 
 libustcomm_la_SOURCES = \
        ustcomm.c \