X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=df6a5b63b1cef86c53dd18f6c861ce6604a32edd;hb=bff8215ae6ade578ab842a75108e517da1789ae6;hp=f6918b54c79d1d1466f8a34006f4168fc7a31999;hpb=6d420eff669a3de55be3ee348f88a4e244b78ecf;p=lttng-tools.git diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f6918b54c..df6a5b63b 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,7 +2,16 @@ AUTOMAKE_OPTIONS = subdir-objects -SUBDIRS = string-utils filter +SUBDIRS = \ + argpar \ + bytecode \ + compat \ + config \ + fd-tracker \ + string-utils \ + filter \ + hashtable \ + argpar-utils # Make sure to always distribute all folders # since SUBDIRS is decided at configure time. @@ -21,94 +30,128 @@ DIST_SUBDIRS = \ consumer \ string-utils \ fd-tracker \ - filter + bytecode \ + filter \ + argpar \ + argpar-utils + # Common library -noinst_LTLIBRARIES = libcommon.la -EXTRA_DIST = mi-lttng-4.0.xsd +noinst_LTLIBRARIES = libpath.la libcommon-lgpl.la libcommon-gpl.la +EXTRA_DIST = mi-lttng-4.1.xsd -libcommon_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 = \ 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 \ - buffer-usage.c \ + actions/rate-policy.c \ buffer-view.h buffer-view.c \ - common.h \ - condition.c \ - context.c context.h \ + channel.c \ + conditions/buffer-usage.c \ + conditions/condition.c \ + conditions/event-rule-matches.c \ + conditions/session-consumed-size.c \ + conditions/session-rotation.c \ credentials.c credentials.h \ - daemonize.c daemonize.h \ defaults.c \ + domain.c \ dynamic-array.c dynamic-array.h \ dynamic-buffer.c dynamic-buffer.h \ endpoint.c \ error.c error.h \ + error-query.c \ evaluation.c \ event.c \ + event-expr/event-expr.c \ + event-field-value.c \ event-rule/event-rule.c \ - event-rule/kprobe.c \ - event-rule/syscall.c \ - event-rule/uprobe.c \ - event-rule/tracepoint.c \ - filter.c filter.h \ + 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 \ fd-handle.c fd-handle.h \ - fs-handle.c fs-handle.h fs-handle-internal.h \ - futex.c futex.h \ kernel-probe.c \ location.c \ + log-level-rule.c \ mi-lttng.c mi-lttng.h \ notification.c \ - optional.h \ payload.c payload.h \ payload-view.c payload-view.h \ - pipe.c pipe.h \ + random.c random.h \ readwrite.c readwrite.h \ runas.c runas.h \ - session-consumed-size.c \ session-descriptor.c \ - session-rotation.c \ snapshot.c snapshot.h \ spawn-viewer.c spawn-viewer.h \ + thread.c thread.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 \ - thread.c thread.h \ - tracker.c tracker.h \ - waiter.c waiter.h + utils.c utils.h if HAVE_ELF_H -libcommon_la_SOURCES += \ +libcommon_lgpl_la_SOURCES += \ lttng-elf.c lttng-elf.h endif -libcommon_la_LIBADD = \ - $(top_builddir)/src/common/config/libconfig.la \ +libcommon_lgpl_la_LIBADD = \ + $(top_builddir)/src/common/bytecode/libbytecode.la \ $(top_builddir)/src/common/compat/libcompat.la \ - $(top_builddir)/src/common/hashtable/libhashtable.la \ - $(top_builddir)/src/common/fd-tracker/libfd-tracker.la \ - $(top_builddir)/src/common/filter/libfilter.la + $(top_builddir)/src/common/config/libconfig.la \ + $(top_builddir)/src/common/filter/libfilter.la \ + $(top_builddir)/src/common/hashtable/libhashtable-lgpl.la \ + $(top_builddir)/src/vendor/msgpack/libmsgpack.la -if BUILD_LIB_COMPAT -SUBDIRS += compat -endif +# 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 \ + index-allocator.c index-allocator.h \ + optional.h \ + pipe.c pipe.h \ + shm.c shm.h \ + trace-chunk.c trace-chunk.h \ + trace-chunk-registry.h \ + uuid.c uuid.h \ + waiter.c waiter.h + +libcommon_gpl_la_LIBADD = \ + 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_HEALTH SUBDIRS += health endif -if BUILD_LIB_HASHTABLE -SUBDIRS += hashtable -endif - if BUILD_LIB_KERNEL_CTL SUBDIRS += kernel-ctl endif @@ -121,9 +164,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 @@ -141,10 +181,6 @@ if BUILD_LIB_INDEX SUBDIRS += index endif -if BUILD_LIB_CONFIG -SUBDIRS += config -endif - if BUILD_LIB_CONSUMER SUBDIRS += consumer endif @@ -162,6 +198,10 @@ 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 \