X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=0de745f616be9ac8170eab3a696545889e04f9af;hb=259b6cb38d19bbe9c039728459bc25acc0f6f8a0;hp=81d81288a48625277a01732326074dd047cd0537;hpb=2e6246b4df9cdd984847183506f345ef92953f87;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 81d81288..0de745f6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,35 @@
 #
 
 ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_MARKERS),)
+ifneq ($(CONFIG_TRACEPOINTS),)
 
-obj-m += ltt-core.o
-obj-m += ltt-tracer.o
-obj-m += ltt-marker-control.o
+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-relay-lockless.o ltt-relay-alloc.o ltt-relay-splice.o \
-		  ltt-relay-vfs.o ltt-event-header.o ltt-ascii.o \
-		  ltt-serialize.o ltt-type-serializer.o
-
-obj-m += ltt-statedump.o
-obj-m += ltt-trace-control.o
-obj-m += ltt-userspace-event.o
-obj-m += ltt-filter.o
-obj-m += ltt-kprobes.o
+ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
+			ltt-probes.o ltt-context.o \
+			lttng-context-pid.o lttng-context-comm.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
+
+#add for testing	lttng-syscalls.o
+
+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
+
 obj-m += probes/
+obj-m += lib/
 
 endif