Import lib ring buffer into LTTng modules

[deliverable/lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 6e4da6c94cfd8140bf31d0f23ba0929bb40503c8..2549f1d15bdb5a1b0828c51ec500ef41fe97169e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,23 +6,20 @@ ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
 obj-m += ltt-core.o
-obj-m += ltt-debugfs-abi.o
-obj-m += ltt-events.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-event-header.o ltt-serialize.o ltt-type-serializer.o
+ltt-relay-objs :=  ltt-events.o ltt-event-header.o ltt-debugfs-abi.o \
+                       ltt-probes.o
 
-#obj-m += ltt-marker-control.o
-#obj-m += ltt-trace-control.o
-#ltt-ascii.o
+obj-m += probes/
 
-#obj-m += ltt-statedump.o
-#obj-m += ltt-userspace-event.o
-#obj-m += ltt-filter.o
-#obj-m += ltt-kprobes.o
-#obj-m += probes/
+# Use externally packaged lib ring buffer if missing in kernel
+ifneq ($(CONFIG_LIB_RING_BUFFER),)
+else
+obj-m += lib/
+endif
 
 endif