X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=606b5ec8b104b756dad0f56e35105c67d43c5907;hb=f1e7d826123df8fe2164aa22fa0f418debc0df1b;hp=fcb14f2fcefc45710e67d50b33f887548ec459d6;hpb=699f9673466e1a6537ad23cc697b79660639f260;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index fcb14f2f..606b5ec8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,6 @@
 #
 
 ifneq ($(KERNELRELEASE),)
-
-ifeq ($(CONFIG_TRACEPOINTS),)
-
-$(error You need to enable CONFIG_TRACEPOINTS in kernel!)
-
-endif #CONFIG_TRACEPOINTS
-
 ifneq ($(CONFIG_TRACEPOINTS),)
 
 obj-m += lttng-ring-buffer-client-discard.o
@@ -27,7 +20,8 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
 			lttng-context-vpid.o lttng-context-tid.o \
 			lttng-context-vtid.o lttng-context-ppid.o \
 			lttng-context-vppid.o lttng-calibrate.o \
-			lttng-context-hostname.o wrapper/random.o
+			lttng-context-hostname.o wrapper/random.o \
+			probes/lttng.o
 
 obj-m += lttng-statedump.o
 lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
@@ -40,10 +34,14 @@ endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
 ifneq ($(CONFIG_PERF_EVENTS),)
 lttng-tracer-objs += $(shell \
 	if [ $(VERSION) -ge 3 \
-		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 34 \) ] ; then \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
 		echo "lttng-context-perf-counters.o" ; fi;)
 endif # CONFIG_PERF_EVENTS
 
+lttng-tracer-objs += $(shell \
+	if [ $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 ] ; then \
+		echo "lttng-tracepoint.o" ; fi;)
+
 obj-m += probes/
 obj-m += lib/