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

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a38325d5a..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,13 +32,14 @@ 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/list.c \
 	actions/notify.c \
@@ -62,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 \
@@ -103,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 \
@@ -116,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
@@ -140,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
@@ -160,10 +159,6 @@ if BUILD_LIB_INDEX
 SUBDIRS += index
 endif
 
-if BUILD_LIB_CONFIG
-SUBDIRS += config
-endif
-
 if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
@@ -184,7 +179,7 @@ noinst_HEADERS = \
 noinst_PROGRAMS = filter-grammar-test
 filter_grammar_test_SOURCES = filter-grammar-test.c
 filter_grammar_test_LDADD = \
-	libcommon.la
+	libcommon-gpl.la
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \