Backport LTTNG_OPTIONAL util

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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 8619b5e25f31b627db462a128286ceb0a7872bd9..e3feaa38f5c639d58ed83070d1ad626410963f2f 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,13 +1,12 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS =
+SUBDIRS = fd-tracker
 
 # Make sure to always distribute all folders
 # 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
+         kernel-consumer ust-consumer testpoint index config consumer \
+         fd-tracker
 
 if BUILD_LIB_COMPAT
 SUBDIRS += compat
@@ -57,23 +56,24 @@ if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
 
-AM_CFLAGS = -fno-strict-aliasing
-
 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
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-3.0.xsd
+EXTRA_DIST = mi-lttng-4.0.xsd
 
 libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        common.h futex.c futex.h uri.c uri.h defaults.c \
                        pipe.c pipe.h readwrite.c readwrite.h \
                        mi-lttng.h mi-lttng.c \
                        daemonize.c daemonize.h \
+                       dynamic-buffer.h dynamic-buffer.c \
+                       buffer-view.h buffer-view.c \
                        unix.c unix.h \
-                       filter.c filter.h context.c context.h
+                       filter.c filter.h context.c context.h \
+                       optional.h
 
 libcommon_la_LIBADD = \
                $(top_builddir)/src/common/config/libconfig.la