X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=5303f26431f3c9e1db9791d314cafc7ffeafbb10;hp=ba93810a8c3fe6af5bf8bd7c4188d037de4421ec;hb=931bdbaa3a3fd1d586a0045c15cac23d6cfc67f9;hpb=b9182dd9d968c2db5655127bf8670c07ffaa894f

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ba93810a8..5303f2643 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,38 +1,162 @@
-AM_CPPFLAGS =
+# SPDX-License-Identifier: GPL-2.0-only
 
-SUBDIRS = hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
+AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS = -fno-strict-aliasing
+SUBDIRS = string-utils
 
-noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h
+# 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 \
+	string-utils \
+	fd-tracker
 
+# Common library
 noinst_LTLIBRARIES = libcommon.la
+EXTRA_DIST = mi-lttng-4.0.xsd
 
-libcommon_la_SOURCES = runas.c runas.h common.h
+libcommon_la_SOURCES = \
+	actions/action.c \
+	actions/notify.c \
+	actions/start-session.c \
+	actions/stop-session.c \
+	buffer-usage.c \
+	buffer-view.h buffer-view.c \
+	common.h \
+	condition.c \
+	context.c context.h \
+	credentials.h \
+	daemonize.c daemonize.h \
+	defaults.c \
+	dynamic-array.c dynamic-array.h \
+	dynamic-buffer.c dynamic-buffer.h \
+	endpoint.c \
+	error.c error.h \
+	evaluation.c \
+	event.c \
+	filter.c filter.h \
+	fs-handle.c fs-handle.h fs-handle-internal.h \
+	futex.c futex.h \
+	location.c \
+	mi-lttng.c mi-lttng.h \
+	notification.c \
+	optional.h \
+	pipe.c pipe.h \
+	readwrite.c readwrite.h \
+	runas.c runas.h \
+	session-consumed-size.c \
+	session-descriptor.c \
+	session-rotation.c \
+	spawn-viewer.c spawn-viewer.h \
+	time.c \
+	trace-chunk.c trace-chunk.h \
+	trace-chunk-registry.h \
+	trigger.c \
+	unix.c unix.h \
+	uri.c uri.h \
+	userspace-probe.c \
+	utils.c utils.h \
+	uuid.c uuid.h \
+	tracker.c tracker.h \
+	waiter.c waiter.h
 
-if COMPAT_EPOLL
-COMPAT=compat/compat-epoll.c
-else
-COMPAT=compat/compat-poll.c
+if HAVE_ELF_H
+libcommon_la_SOURCES += \
+	lttng-elf.c lttng-elf.h
 endif
 
-noinst_LTLIBRARIES += libcompat.la
+libcommon_la_LIBADD = \
+	$(top_builddir)/src/common/config/libconfig.la \
+	$(top_builddir)/src/common/compat/libcompat.la \
+	$(top_builddir)/src/common/hashtable/libhashtable.la \
+	$(top_builddir)/src/common/fd-tracker/libfd-tracker.la
 
-libcompat_la_SOURCES = compat/poll.h compat/fcntl.h compat/splice.h compat/endian.h \
-                       compat/socket.h compat/compat-fcntl.c $(COMPAT)
+if BUILD_LIB_COMPAT
+SUBDIRS += compat
+endif
+
+if BUILD_LIB_HEALTH
+SUBDIRS += health
+endif
+
+if BUILD_LIB_HASHTABLE
+SUBDIRS += hashtable
+endif
+
+if BUILD_LIB_KERNEL_CTL
+SUBDIRS += kernel-ctl
+endif
+
+if BUILD_LIB_SESSIOND_COMM
+SUBDIRS += sessiond-comm
+endif
 
-# Consumer library
-noinst_LTLIBRARIES += libconsumer.la
+if BUILD_LIB_RELAYD
+SUBDIRS += relayd
+endif
 
-libconsumer_la_SOURCES = consumer.c consumer.h
+if BUILD_LIB_FD_TRACKER
+SUBDIRS += fd-tracker
+endif
 
-libconsumer_la_LIBADD = \
-		$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
-		$(top_builddir)/src/common/kernel-consumer/libkernel-consumer.la \
-		$(top_builddir)/src/common/hashtable/libhashtable.la \
-		$(top_builddir)/src/common/libcompat.la
+if BUILD_LIB_KERNEL_CONSUMER
+SUBDIRS += kernel-consumer
+endif
 
-if HAVE_LIBLTTNG_UST_CTL
-libconsumer_la_LIBADD += \
-		$(top_builddir)/src/common/ust-consumer/libust-consumer.la
+if BUILD_LIB_UST_CONSUMER
+SUBDIRS += ust-consumer
 endif
+
+if BUILD_LIB_TESTPOINT
+SUBDIRS += testpoint
+endif
+
+if BUILD_LIB_INDEX
+SUBDIRS += index
+endif
+
+if BUILD_LIB_CONFIG
+SUBDIRS += config
+endif
+
+if BUILD_LIB_CONSUMER
+SUBDIRS += consumer
+endif
+
+noinst_HEADERS = \
+	align.h \
+	bug.h \
+	defaults.h \
+	error.h \
+	futex.h \
+	lttng-kernel.h \
+	lttng-kernel-old.h \
+	macros.h \
+	time.h \
+	uri.h \
+	utils.h
+
+all-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+		cp -f $(srcdir)/$$script $(builddir); \
+		done; \
+	fi
+
+clean-local:
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for script in $(EXTRA_DIST); do \
+		rm -f $(builddir)/$$script; \
+		done; \
+	fi