LTTng modules now builds again

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index befc98e04b2b2c0632bb403763c142721cdcd356..109b8060498b5cc57e860184f465614933357610 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,29 +3,33 @@
 #
 
 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-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
+ltt-relay-objs :=  ltt-events.o ltt-event-header.o ltt-debugfs-abi.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
-obj-m += probes/
+#ltt-type-serializer.o
+#ltt-serialize.o
+#obj-m += ltt-marker-control.o
+#obj-m += ltt-trace-control.o
+#ltt-ascii.o
+
+#obj-m += ltt-statedump.o
+#obj-m += ltt-userspace-event.o
+#obj-m += ltt-filter.o
+#obj-m += ltt-kprobes.o
+#obj-m += probes/
 
 endif
 
 else
        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
        PWD := $(shell pwd)
+       CFLAGS = $(EXTCFLAGS)
 
 default:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) modules