X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2FMakefile.am;h=2835e9f922a9351e39bf4572812f012f065eb3d0;hb=82d52a522eccf1f0fb49da4fb3436b55449aa38e;hp=df278fa4796cf497bcb70e573061c92aaf1eec46;hpb=ad63a966ae7a204528fa77599f92100d7341be7a;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index df278fa47..2835e9f92 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,16 +32,18 @@ DIST_SUBDIRS = \
 	fd-tracker \
 	bytecode \
 	filter \
-	argpar
+	argpar \
+	argpar-utils
 
 # 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 \
@@ -61,13 +68,17 @@ libcommon_la_SOURCES = \
 	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 \
@@ -115,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
@@ -139,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
@@ -159,10 +159,6 @@ if BUILD_LIB_INDEX
 SUBDIRS += index
 endif
 
-if BUILD_LIB_CONFIG
-SUBDIRS += config
-endif
-
 if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
@@ -180,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.la
+
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
 		for script in $(EXTRA_DIST); do \