X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=517d1f7502f49476be05c95c2b78b94d77d59b0c;hb=b64bc438d1c9bbcf241c598ca9f0e00d5770d784;hp=b9f48ca92f11d67e233e9e07c3da2efd5e186e4e;hpb=1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index b9f48ca9..517d1f75 100644
--- a/Makefile
+++ b/Makefile
@@ -3,31 +3,34 @@
 #
 
 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-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
-
-obj-m += ltt-serialize.o
-obj-m += ltt-statedump.o
-obj-m += ltt-type-serializer.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-core.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
+
+ifneq ($(CONFIG_PERF_EVENTS),)
+ltt-relay-objs += lttng-context-perf-counters.o
+endif
+
 obj-m += probes/
-obj-m += ltt-ascii.o
+obj-m += lib/
 
 endif
 
 else
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
+	CFLAGS = $(EXTCFLAGS)
 
 default:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules