lttng-modules v0.19-stable: setup_trace_write: Fix recursive locking

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index b9f48ca92f11d67e233e9e07c3da2efd5e186e4e..81d81288a48625277a01732326074dd047cd0537 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,23 +11,22 @@ obj-m += ltt-marker-control.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-relay-vfs.o ltt-event-header.o ltt-ascii.o \
+                 ltt-serialize.o ltt-type-serializer.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
 obj-m += probes/
-obj-m += ltt-ascii.o
 
 endif
 
 else
        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
        PWD := $(shell pwd)
+       CFLAGS = $(EXTCFLAGS)
 
 default:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) modules