X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=ba35170d91f672b74276d773ec8cd6ee65334675;hb=e5b05ab3d0b711701109678ce8570250d199d9b9;hp=caf588e4093e9017a8138a3883c934bed6bef57c;hpb=85b053182c4e300c717483ad231f5c04cbf5e4b7;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index caf588e40..ba35170d9 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -3,10 +3,15 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = \
-	string-utils \
+	argpar \
 	bytecode \
+	compat \
+	config \
+	fd-tracker \
+	string-utils \
 	filter \
-	argpar
+	hashtable \
+	argpar-utils
 
 # Make sure to always distribute all folders
 # since SUBDIRS is decided at configure time.
@@ -27,25 +32,28 @@ DIST_SUBDIRS = \
 	fd-tracker \
 	bytecode \
 	filter \
-	argpar
+	argpar \
+	argpar-utils
 
 # Common library
-noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-4.0.xsd
+noinst_LTLIBRARIES = libcommon-gpl.la
+EXTRA_DIST = mi-lttng-4.1.xsd
 
-libcommon_la_SOURCES = \
+libcommon_gpl_la_SOURCES = \
 	actions/action.c \
-	actions/group.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 \
+	actions/rate-policy.c \
 	buffer-view.h buffer-view.c \
 	common.h \
 	conditions/buffer-usage.c \
 	conditions/condition.c \
-	conditions/on-event.c \
+	conditions/event-rule-matches.c \
 	conditions/session-consumed-size.c \
 	conditions/session-rotation.c \
 	context.c context.h \
@@ -57,20 +65,26 @@ libcommon_la_SOURCES = \
 	dynamic-buffer.c dynamic-buffer.h \
 	endpoint.c \
 	error.c error.h \
+	error-query.c \
 	evaluation.c \
 	event.c \
-	event-expr-to-bytecode.c event-expr-to-bytecode.h \
+	event-expr/event-expr.c \
 	event-field-value.c \
 	event-rule/event-rule.c \
-	event-rule/kernel-probe.c \
-	event-rule/syscall.c \
-	event-rule/userspace-probe.c \
-	event-rule/tracepoint.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 \
@@ -81,6 +95,7 @@ libcommon_la_SOURCES = \
 	pipe.c pipe.h \
 	readwrite.c readwrite.h \
 	runas.c runas.h \
+	shm.c shm.h \
 	session-descriptor.c \
 	snapshot.c snapshot.h \
 	spawn-viewer.c spawn-viewer.h \
@@ -98,11 +113,11 @@ libcommon_la_SOURCES = \
 	waiter.c waiter.h
 
 if HAVE_ELF_H
-libcommon_la_SOURCES += \
+libcommon_gpl_la_SOURCES += \
 	lttng-elf.c lttng-elf.h
 endif
 
-libcommon_la_LIBADD = \
+libcommon_gpl_la_LIBADD = \
 	$(top_builddir)/src/common/bytecode/libbytecode.la \
 	$(top_builddir)/src/common/config/libconfig.la \
 	$(top_builddir)/src/common/compat/libcompat.la \
@@ -111,18 +126,10 @@ libcommon_la_LIBADD = \
 	$(top_builddir)/src/common/filter/libfilter.la \
 	$(top_builddir)/src/vendor/msgpack/libmsgpack.la
 
-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
@@ -135,9 +142,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
@@ -155,10 +159,6 @@ if BUILD_LIB_INDEX
 SUBDIRS += index
 endif
 
-if BUILD_LIB_CONFIG
-SUBDIRS += config
-endif
-
 if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
@@ -176,6 +176,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-gpl.la
+
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
 		for script in $(EXTRA_DIST); do \