X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=dc69f179a9e8c7da0182b8768450a6e2eafd874b;hp=171748f433aacc32cc3f79254e1cb1ea4e1957ec;hb=10dc2d1097e731eda1f67a13e2b40c91ee2e4c8d;hpb=b3f35e021305afc1a40b9f3637c77595f38d6df2 diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 171748f43..dc69f179a 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = string-utils # since SUBDIRS is decided at configure time. DIST_SUBDIRS = compat health hashtable kernel-ctl sessiond-comm relayd \ kernel-consumer ust-consumer testpoint index config consumer \ - string-utils + string-utils fd-tracker # # Common library noinst_LTLIBRARIES = libcommon.la @@ -17,7 +17,7 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.h runas.c \ pipe.c pipe.h readwrite.c readwrite.h \ mi-lttng.h mi-lttng.c \ daemonize.c daemonize.h \ - unix.h \ + unix.c unix.h \ filter.c filter.h context.c context.h \ action.c notify.c condition.c buffer-usage.c \ session-consumed-size.c \ @@ -27,17 +27,20 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.h runas.c \ buffer-view.h buffer-view.c \ location.c \ waiter.h waiter.c \ - userspace-probe.c + userspace-probe.c event.c time.c \ + session-descriptor.c credentials.h \ + trace-chunk.c trace-chunk.h trace-chunk-registry.h \ + dynamic-array.h dynamic-array.c optional.h \ + uuid.c uuid.h + +if HAVE_ELF_H +libcommon_la_SOURCES += lttng-elf.h lttng-elf.c +endif libcommon_la_LIBADD = \ $(top_builddir)/src/common/config/libconfig.la \ - $(UUID_LIBS) - -if BUILD_LIB_UNIX -libcommon_la_SOURCES += unix.c -else -libcommon_la_SOURCES += unix-stub.c -endif + $(top_builddir)/src/common/compat/libcompat.la \ + $(top_builddir)/src/common/hashtable/libhashtable.la if BUILD_LIB_COMPAT SUBDIRS += compat @@ -60,7 +63,7 @@ SUBDIRS += sessiond-comm endif if BUILD_LIB_RELAYD -SUBDIRS += relayd +SUBDIRS += relayd fd-tracker endif if BUILD_LIB_KERNEL_CONSUMER @@ -89,7 +92,7 @@ endif noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \ uri.h utils.h lttng-kernel-old.h \ - align.h bitfield.h bug.h time.h + align.h bug.h time.h all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \