X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=cb8ac7b10ab2190a98adca2bf62dd2e4a6885d61;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=381cf054601f026427219240d22c3fe3f350b7dc;hpb=af0818efba7511c6cd42806504102151d1a4c973;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 381cf0546..cb8ac7b10 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -3,10 +3,14 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = \
-	string-utils \
+	argpar \
 	bytecode \
+	compat \
+	config \
+	fd-tracker \
+	string-utils \
 	filter \
-	argpar
+	hashtable
 
 # Make sure to always distribute all folders
 # since SUBDIRS is decided at configure time.
@@ -31,7 +35,7 @@ DIST_SUBDIRS = \
 
 # 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 \
@@ -62,14 +66,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-kprobe.c \
 	event-rule/kernel-syscall.c \
 	event-rule/kernel-uprobe.c \
-	event-rule/tracepoint.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 \
@@ -117,18 +124,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
@@ -141,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
@@ -161,10 +157,6 @@ if BUILD_LIB_INDEX
 SUBDIRS += index
 endif
 
-if BUILD_LIB_CONFIG
-SUBDIRS += config
-endif
-
 if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
@@ -183,7 +175,7 @@ noinst_HEADERS = \
 	utils.h
 
 noinst_PROGRAMS = filter-grammar-test
-filter_grammar_test_SOURCES = filter-grammar-test.c
+filter_grammar_test_SOURCES = filter-grammar-test.cpp
 filter_grammar_test_LDADD = \
 	libcommon.la