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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5303f2643..5d1904d9c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,15 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS = string-utils
+SUBDIRS = \
+	argpar \
+	bytecode \
+	compat \
+	config \
+	fd-tracker \
+	string-utils \
+	filter \
+	hashtable
 
 # Make sure to always distribute all folders
 # since SUBDIRS is decided at configure time.
@@ -20,44 +28,74 @@ DIST_SUBDIRS = \
 	config \
 	consumer \
 	string-utils \
-	fd-tracker
+	fd-tracker \
+	bytecode \
+	filter \
+	argpar
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-4.0.xsd
+EXTRA_DIST = mi-lttng-4.1.xsd
 
 libcommon_la_SOURCES = \
 	actions/action.c \
+	actions/list.c \
 	actions/notify.c \
+	actions/path.c \
+	actions/rotate-session.c \
+	actions/snapshot-session.c \
 	actions/start-session.c \
 	actions/stop-session.c \
-	buffer-usage.c \
+	actions/rate-policy.c \
 	buffer-view.h buffer-view.c \
 	common.h \
-	condition.c \
+	conditions/buffer-usage.c \
+	conditions/condition.c \
+	conditions/event-rule-matches.c \
+	conditions/session-consumed-size.c \
+	conditions/session-rotation.c \
 	context.c context.h \
-	credentials.h \
+	credentials.c credentials.h \
 	daemonize.c daemonize.h \
 	defaults.c \
+	domain.c \
 	dynamic-array.c dynamic-array.h \
 	dynamic-buffer.c dynamic-buffer.h \
 	endpoint.c \
 	error.c error.h \
+	error-query.c \
 	evaluation.c \
 	event.c \
+	event-expr/event-expr.c \
+	event-field-value.c \
+	event-rule/event-rule.c \
+	event-rule/kernel-kprobe.c \
+	event-rule/kernel-syscall.c \
+	event-rule/kernel-uprobe.c \
+	event-rule/kernel-tracepoint.c \
+	event-rule/user-tracepoint.c \
+	event-rule/log4j-logging.c \
+	event-rule/jul-logging.c \
+	event-rule/python-logging.c \
 	filter.c filter.h \
+	fd-handle.c fd-handle.h \
 	fs-handle.c fs-handle.h fs-handle-internal.h \
 	futex.c futex.h \
+	kernel-probe.c \
+	index-allocator.c index-allocator.h \
 	location.c \
+	log-level-rule.c \
 	mi-lttng.c mi-lttng.h \
 	notification.c \
 	optional.h \
+	payload.c payload.h \
+	payload-view.c payload-view.h \
 	pipe.c pipe.h \
 	readwrite.c readwrite.h \
 	runas.c runas.h \
-	session-consumed-size.c \
+	shm.c shm.h \
 	session-descriptor.c \
-	session-rotation.c \
+	snapshot.c snapshot.h \
 	spawn-viewer.c spawn-viewer.h \
 	time.c \
 	trace-chunk.c trace-chunk.h \
@@ -68,6 +106,7 @@ libcommon_la_SOURCES = \
 	userspace-probe.c \
 	utils.c utils.h \
 	uuid.c uuid.h \
+	thread.c thread.h \
 	tracker.c tracker.h \
 	waiter.c waiter.h
 
@@ -77,23 +116,18 @@ libcommon_la_SOURCES += \
 endif
 
 libcommon_la_LIBADD = \
+	$(top_builddir)/src/common/bytecode/libbytecode.la \
 	$(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
-
-if BUILD_LIB_COMPAT
-SUBDIRS += compat
-endif
+	$(top_builddir)/src/common/fd-tracker/libfd-tracker.la \
+	$(top_builddir)/src/common/filter/libfilter.la \
+	$(top_builddir)/src/vendor/msgpack/libmsgpack.la
 
 if BUILD_LIB_HEALTH
 SUBDIRS += health
 endif
 
-if BUILD_LIB_HASHTABLE
-SUBDIRS += hashtable
-endif
-
 if BUILD_LIB_KERNEL_CTL
 SUBDIRS += kernel-ctl
 endif
@@ -106,9 +140,6 @@ if BUILD_LIB_RELAYD
 SUBDIRS += relayd
 endif
 
-if BUILD_LIB_FD_TRACKER
-SUBDIRS += fd-tracker
-endif
 
 if BUILD_LIB_KERNEL_CONSUMER
 SUBDIRS += kernel-consumer
@@ -126,10 +157,6 @@ if BUILD_LIB_INDEX
 SUBDIRS += index
 endif
 
-if BUILD_LIB_CONFIG
-SUBDIRS += config
-endif
-
 if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
@@ -147,6 +174,11 @@ noinst_HEADERS = \
 	uri.h \
 	utils.h
 
+noinst_PROGRAMS = filter-grammar-test
+filter_grammar_test_SOURCES = filter-grammar-test.c
+filter_grammar_test_LDADD = \
+	libcommon.la
+
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
 		for script in $(EXTRA_DIST); do \