X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile;h=0d16bcbbaddadde8c01e6cc8d656e5295c906abe;hb=e8951e63e00a0b56d8ce1b0c821e5ebfb1e35d63;hp=8da265d5e54da460b46200e74bf1f23ce0267539;hpb=881833e349e275ac324fc3abf8a34d76f91047ea;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 8da265d5..0d16bcbb 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,32 @@ ifneq ($(CONFIG_TRACEPOINTS),)
 obj-m += ltt-ring-buffer-client-discard.o
 obj-m += ltt-ring-buffer-client-overwrite.o
 obj-m += ltt-ring-buffer-metadata-client.o
+obj-m += ltt-ring-buffer-client-mmap-discard.o
+obj-m += ltt-ring-buffer-client-mmap-overwrite.o
+obj-m += ltt-ring-buffer-metadata-mmap-client.o
 
 obj-m += ltt-relay.o
-ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
-			ltt-probes.o ltt-core.o
+ltt-relay-objs :=  ltt-events.o lttng-abi.o \
+			ltt-probes.o ltt-context.o \
+			lttng-context-pid.o lttng-context-procname.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
+
+ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
+ltt-relay-objs += lttng-syscalls.o
+endif
 
-obj-m += probes/
+ifneq ($(CONFIG_PERF_EVENTS),)
+ltt-relay-objs += $(shell \
+	if [ $(VERSION) -ge 3 \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
+		echo "lttng-context-perf-counters.o" ; fi;)
+endif
 
-# Use externally packaged lib ring buffer if missing in kernel
-ifneq ($(CONFIG_LIB_RING_BUFFER),)
-else
+obj-m += probes/
 obj-m += lib/
-endif
 
 endif
 
@@ -33,7 +47,6 @@ default:
 
 modules_install:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-	/sbin/depmod -a
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean