Move the ringbuffer and counter clients to 'src/common/'

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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e450f8c858876fd617b6344ab122626d7c75e821..ed798b3be51751ca9e1b1fa2edf775029459e982 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -11,14 +11,20 @@ noinst_HEADERS = \
        bitfield.h \
        bitmap.h \
        clock.h \
-       dynamic-type.h \
-       elf.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 \
+       tracepoint.h \
+       tracer.h \
        wait.h
 
 noinst_HEADERS += \
@@ -45,8 +51,10 @@ noinst_HEADERS += \
 
 noinst_LTLIBRARIES = \
        libcounter.la \
+       libcounter-clients.la \
        libmsgpack.la \
        libringbuffer.la \
+       libringbuffer-clients.la \
        libsnprintf.la \
        libcommon.la \
        libustcomm.la
@@ -62,9 +70,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
 
@@ -74,6 +80,15 @@ endif
 
 libcounter_la_CFLAGS = -DUST_COMPONENT="libcounter" $(AM_CFLAGS)
 
+# counter-clients
+libcounter_clients_la_SOURCES = \
+       counter-clients/clients.c \
+       counter-clients/clients.h \
+       counter-clients/percpu-32-modular.c \
+       counter-clients/percpu-64-modular.c
+
+libcounter_clients_la_CFLAGS = -DUST_COMPONENT="libcounter-clients" $(AM_CFLAGS)
+
 # msgpack
 libmsgpack_la_SOURCES = \
        msgpack/msgpack.c \
@@ -100,8 +115,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 = \
@@ -113,6 +126,20 @@ endif
 
 libringbuffer_la_CFLAGS = -DUST_COMPONENT="libringbuffer" $(AM_CFLAGS)
 
+# ringbuffer-client
+libringbuffer_clients_la_SOURCES = \
+       ringbuffer-clients/clients.c \
+       ringbuffer-clients/clients.h \
+       ringbuffer-clients/discard.c \
+       ringbuffer-clients/discard-rt.c \
+       ringbuffer-clients/metadata.c \
+       ringbuffer-clients/metadata-template.h \
+       ringbuffer-clients/overwrite.c \
+       ringbuffer-clients/overwrite-rt.c \
+       ringbuffer-clients/template.h
+
+libringbuffer_clients_la_CFLAGS = -DUST_COMPONENT="libringbuffer-clients" $(AM_CFLAGS)
+
 # snprintf
 libsnprintf_la_SOURCES = \
        snprintf/fflush.c \
@@ -130,10 +157,22 @@ libsnprintf_la_SOURCES = \
 
 # Common library
 libcommon_la_SOURCES = \
+       core.c \
+       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 = \