X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=0885448b5dbccb63d53fd32ee05ea4a90f2bf66a;hb=71e2e361e570a4701e06694c6ffeceb3a81a01bd;hp=cf4801d569bb04bbf9be5639464e4c13cc4a4c6e;hpb=138d6838d156cb4a36a738658d5f7f67c5e96ec5;p=lttng-tools.git diff --git a/src/common/Makefile.am b/src/common/Makefile.am index cf4801d56..0885448b5 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. @@ -68,11 +72,11 @@ libcommon_la_SOURCES = \ 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 \ @@ -120,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 @@ -144,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 @@ -164,10 +157,6 @@ if BUILD_LIB_INDEX SUBDIRS += index endif -if BUILD_LIB_CONFIG -SUBDIRS += config -endif - if BUILD_LIB_CONSUMER SUBDIRS += consumer endif