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

diff --git a/Makefile b/Makefile
index dfa0792b..fcb14f2f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,13 @@
 #
 
 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
@@ -20,28 +27,29 @@ 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 \
-			wrapper/random.o
+			lttng-context-hostname.o wrapper/random.o
 
 obj-m += lttng-statedump.o
-lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o
+lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+			wrapper/fdtable.o
 
 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
-lttng-tracer-objs += lttng-syscalls.o
-endif
+lttng-tracer-objs += lttng-syscalls.o probes/lttng-probe-user.o
+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 33 \) ] ; then \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 34 \) ] ; then \
 		echo "lttng-context-perf-counters.o" ; fi;)
-endif
+endif # CONFIG_PERF_EVENTS
 
 obj-m += probes/
 obj-m += lib/
 
-endif
+endif # CONFIG_TRACEPOINTS
 
-else
+else # KERNELRELEASE
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
 	CFLAGS = $(EXTCFLAGS)
@@ -55,4 +63,6 @@ modules_install:
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
-endif
+%.i: %.c
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+endif # KERNELRELEASE