X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=b0c761a1a72a4c0f3eb9836eb6c2df612bab1332;hb=8b42d6b28b6465da73c798577f15ac7b6105bdbc;hp=beeb7b70c22065f51a992dd816c9d2a437cfbef4;hpb=6ac46b1df9e7393bfc1d7081c87bba72d666f362;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index beeb7b70c..b0c761a1a 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -23,18 +23,19 @@ DIST_SUBDIRS = \
 	fd-tracker
 
 # Common library
-noinst_LTLIBRARIES = libcommon-gpl.la
+noinst_LTLIBRARIES = libpath.la libcommon-lgpl.la libcommon-gpl.la
 EXTRA_DIST = mi-lttng-4.0.xsd
 
-libcommon_gpl_la_SOURCES = \
+# The libcommon-lgpl static archive contains only LGPLv2.1 code. It is
+# meant to be used by LGPLv2.1 libraries such as liblttng-ctl. It also
+# contains libcommon-lgpl.la.
+libcommon_lgpl_la_SOURCES = \
 	action.c \
-	buffer-usage.c \
 	buffer-view.h buffer-view.c \
-	common.h \
-	condition.c \
-	context.c context.h \
+	buffer-usage.c \
+	channel.c \
 	credentials.h \
-	daemonize.c daemonize.h \
+	condition.c \
 	defaults.c \
 	dynamic-array.c dynamic-array.h \
 	dynamic-buffer.c dynamic-buffer.h \
@@ -42,14 +43,11 @@ libcommon_gpl_la_SOURCES = \
 	error.c error.h \
 	evaluation.c \
 	event.c \
-	filter.c filter.h \
-	futex.c futex.h \
 	location.c \
 	mi-lttng.c mi-lttng.h \
 	notification.c \
 	notify.c \
-	optional.h \
-	pipe.c pipe.h \
+	random.c random.h \
 	readwrite.c readwrite.h \
 	runas.c runas.h \
 	session-consumed-size.c \
@@ -57,31 +55,55 @@ libcommon_gpl_la_SOURCES = \
 	session-rotation.c \
 	spawn-viewer.c spawn-viewer.h \
 	time.c \
-	trace-chunk.c trace-chunk.h \
-	trace-chunk-registry.h \
+	tracker.c tracker.h \
 	trigger.c \
 	unix.c unix.h \
 	uri.c uri.h \
 	userspace-probe.c \
-	utils.c utils.h \
-	uuid.c uuid.h \
-	tracker.c tracker.h \
-	waiter.c waiter.h \
-	fs-handle.h fs-handle-internal.h fs-handle.c
+	utils.c utils.h
 
 if HAVE_ELF_H
-libcommon_gpl_la_SOURCES += \
+libcommon_lgpl_la_SOURCES += \
 	lttng-elf.c lttng-elf.h
 endif
 
-libcommon_gpl_la_LIBADD = \
+libcommon_lgpl_la_LIBADD = \
 	$(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/hashtable/libhashtable-lgpl.la
+
+# The libpath static archive contains GPLv2 compatible code. It is
+# meant to be used by GPL executables.
+
+libpath_la_SOURCES = \
+	path.c path.h
+
+# The libcommon-gpl static archive contains GPLv2 compatible code. It is
+# meant to be used by GPL executables.
+libcommon_gpl_la_SOURCES = \
+	common.h \
+	context.c context.h \
+	daemonize.c daemonize.h \
+	filter.c filter.h \
+	fs-handle.c fs-handle.h fs-handle-internal.h \
+	futex.c futex.h \
+	optional.h \
+	pipe.c pipe.h \
+	trace-chunk.c trace-chunk.h \
+	trace-chunk-registry.h \
+	uuid.c uuid.h \
+	waiter.c waiter.h
+
+libcommon_gpl_la_LIBADD = \
+	-lurcu -lurcu-common \
+	libcommon-lgpl.la \
+	libpath.la \
+	$(top_builddir)/src/common/hashtable/libhashtable-gpl.la \
 	$(top_builddir)/src/common/fd-tracker/libfd-tracker.la
 
 if BUILD_LIB_COMPAT
 SUBDIRS += compat
+libcommon_lgpl_la_LIBADD += \
+	$(top_builddir)/src/common/compat/libcompat.la
 endif
 
 if BUILD_LIB_HEALTH