X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2FMakefile;h=7129e979e28fe8678123ffcc3285730c0c9c47a3;hb=b64bc438d1c9bbcf241c598ca9f0e00d5770d784;hp=d8f1c40309599f443a69246c65eb7834190bc869;hpb=1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6;p=lttng-modules.git

diff --git a/probes/Makefile b/probes/Makefile
index d8f1c403..7129e979 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -1,47 +1,44 @@
-# LTTng tracing probes
-
-ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_kernel-trace.o = -pg
-CFLAGS_REMOVE_mm-trace.o = -pg
-CFLAGS_REMOVE_fs-trace.o = -pg
-CFLAGS_REMOVE_ipc-trace.o = -pg
-CFLAGS_REMOVE_lockdep-trace.o = -pg
-CFLAGS_REMOVE_rcu-trace.o = -pg
-CFLAGS_REMOVE_syscall-trace.o = -pg
-CFLAGS_REMOVE_trap-trace.o = -pg
-CFLAGS_REMOVE_pm-trace.o = -pg
-endif
+#
+# Makefile for the LTT probes.
+# Only build from the package top-level directory. Never use with make directly.
 
-obj-m += kernel-trace.o mm-trace.o fs-trace.o ipc-trace.o lockdep-trace.o \
-	 rcu-trace.o syscall-trace.o trap-trace.o pm-trace.o
+ifneq ($(KERNELRELEASE),)
+ifneq ($(CONFIG_TRACEPOINTS),)
 
-ifeq ($(CONFIG_NET),y)
-ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_net-trace.o = -pg
-CFLAGS_REMOVE_net-extended-trace.o = -pg
-endif
-obj-m += net-trace.o net-extended-trace.o
+ccflags-y += -I$(PWD)/probes
+obj-m += lttng-types.o
+
+obj-m += lttng-probe-lttng.o
+
+obj-m += lttng-probe-sched.o
+obj-m += lttng-probe-kvm.o
+obj-m += lttng-probe-irq.o
+obj-m += lttng-probe-block.o
+obj-m += lttng-probe-syscalls.o
+
+ifneq ($(CONFIG_KPROBES),)
+obj-m += lttng-kprobes.o
 endif
 
-ifdef CONFIG_JBD2
-ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_jbd2-trace.o = -pg
+ifneq ($(CONFIG_DYNAMIC_FTRACE),)
+obj-m += lttng-ftrace.o
 endif
-obj-m += jbd2-trace.o
+
 endif
 
-#ifdef CONFIG_EXT4_FS
-#ifdef CONFIG_FTRACE
-#CFLAGS_REMOVE_ext4-trace.o = -pg
-#endif
-#obj-$(CONFIG_LTT_TRACEPROBES)	+= ext4-trace.o
-#endif
+else
+	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+	PWD := $(shell pwd)
+	CFLAGS = $(EXTCFLAGS)
 
-ifdef CONFIG_BLOCK
-ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_block-trace.o = -pg
-endif
-obj-m += block-trace.o
-endif
+default:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
 
+modules_install:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+	/sbin/depmod -a
 
+clean:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+
+endif