X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=f7aa23f6127959f0d3309790639b3f38fdf2d1c6;hb=4949b0e607fa16a22b141c9253c89f930f70e03f;hp=b1bc6b95f953366472d7b4559b17970bc4fad881;hpb=72e6c528aad2cdd1152af21258a5f84870155b41;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index b1bc6b95..f7aa23f6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,13 @@
 ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
-KERNELDIR=${LTTNG_KERNELDIR}
+KERNELDIR = ${LTTNG_KERNELDIR}
+MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 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
@@ -21,7 +23,7 @@ $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
 endif
 endif
 
-include $(KBUILD_EXTMOD)/Makefile.ABI.workarounds
+include $(MAKEFILEDIR)/Makefile.ABI.workarounds
 
 obj-m += lttng-ring-buffer-client-discard.o
 obj-m += lttng-ring-buffer-client-overwrite.o
@@ -29,6 +31,7 @@ obj-m += lttng-ring-buffer-metadata-client.o
 obj-m += lttng-ring-buffer-client-mmap-discard.o
 obj-m += lttng-ring-buffer-client-mmap-overwrite.o
 obj-m += lttng-ring-buffer-metadata-mmap-client.o
+obj-m += lttng-clock.o
 
 obj-m += lttng-tracer.o
 lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
@@ -37,7 +40,8 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
 			lttng-context-prio.o lttng-context-nice.o \
 			lttng-context-vpid.o lttng-context-tid.o \
 			lttng-context-vtid.o lttng-context-ppid.o \
-			lttng-context-vppid.o lttng-calibrate.o \
+			lttng-context-vppid.o lttng-context-cpu-id.o \
+			lttng-calibrate.o \
 			lttng-context-hostname.o wrapper/random.o \
 			probes/lttng.o wrapper/trace-clock.o \
 			wrapper/page_alloc.o \