X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2FKbuild;h=a5a840a7d900bb315cfdf34e7772469e4c026dfa;hb=218585b9b0ab4586da4b6fc55c85a70b0b201151;hp=a48e1cb13196dccc877c34b68f536c17ecd8d551;hpb=876e2e9225074dede98488270dee7226e73d2a63;p=lttng-modules.git

diff --git a/src/Kbuild b/src/Kbuild
index a48e1cb1..a5a840a7 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -1,8 +1,28 @@
 # SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
 
+ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
+  ifeq ($(CONFIG_TRACEPOINTS),)
+    $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+  endif # CONFIG_TRACEPOINTS
+endif # ifdef CONFIG_LOCALVERSION
+
 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
-include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
+lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
+
+#
+# Check for stale version.h, which can be a leftover from an old Linux
+# kernel tree moved to a newer kernel version, only pruned by make
+# distclean.
+#
+ifneq ($(wildcard $(lttng_check_linux_version)),)
+  ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
+    $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
+  endif
+endif
+
+include $(TOP_LTTNG_MODULES_DIR)/src/Kbuild.common
 
 ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
@@ -12,13 +32,21 @@ obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-client.o
 obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o
 obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o
 obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-event-notifier-client.o
+
+obj-$(CONFIG_LTTNG) += lttng-counter-client-percpu-32-modular.o
+ifneq ($CONFIG_64BIT),)
+	obj-$(CONFIG_LTTNG) += lttng-counter-client-percpu-64-modular.o
+endif # CONFIG_64BIT
+
 obj-$(CONFIG_LTTNG) += lttng-clock.o
 
 obj-$(CONFIG_LTTNG) += lttng-tracer.o
 
 obj-$(CONFIG_LTTNG) += lttng-wrapper.o
 
-lttng-tracer-objs := lttng-events.o lttng-abi.o lttng-string-utils.o \
+lttng-tracer-objs := lib/msgpack/msgpack.o \
+                     lttng-events.o lttng-abi.o lttng-string-utils.o \
                      lttng-probes.o lttng-context.o \
                      lttng-context-pid.o lttng-context-procname.o \
                      lttng-context-prio.o lttng-context-nice.o \
@@ -39,15 +67,17 @@ lttng-tracer-objs := lttng-events.o lttng-abi.o lttng-string-utils.o \
                      lttng-context-vsgid.o \
                      lttng-context-interruptible.o \
                      lttng-context-need-reschedule.o \
-                     lttng-context-callstack.o lttng-calibrate.o \
+                     lttng-calibrate.o \
                      lttng-context-hostname.o \
+		     lttng-context-callstack.o \
                      probes/lttng.o \
                      lttng-tracker-id.o \
-                     lttng-filter.o lttng-filter-interpreter.o \
-                     lttng-filter-specialize.o \
-                     lttng-filter-validator.o \
+                     lttng-bytecode.o lttng-bytecode-interpreter.o \
+                     lttng-bytecode-specialize.o \
+                     lttng-bytecode-validator.o \
                      probes/lttng-probe-user.o \
                      lttng-tp-mempool.o \
+                     lttng-event-notifier-notification.o
 
 lttng-wrapper-objs := wrapper/page_alloc.o \
                       wrapper/random.o \
@@ -55,6 +85,7 @@ lttng-wrapper-objs := wrapper/page_alloc.o \
                       wrapper/kallsyms.o \
                       wrapper/irqdesc.o \
                       wrapper/fdtable.o \
+                      wrapper/genhd.o \
                       lttng-wrapper-impl.o
 
 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
@@ -114,3 +145,4 @@ lttng-statedump-objs := lttng-statedump-impl.o
 
 obj-$(CONFIG_LTTNG) += probes/
 obj-$(CONFIG_LTTNG) += lib/
+obj-$(CONFIG_LTTNG) += tests/