X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=606b5ec8b104b756dad0f56e35105c67d43c5907;hb=1d8ee641416f97d49f04841c9b2fbacdff32d8f8;hp=d06e6764119d4acd0d49745be0ac8a2c4445b5b2;hpb=23e6a44f127a046d02dbe8e9895cc2baf0d57c7d;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index d06e6764..606b5ec8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,28 +20,34 @@ 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 \
+			probes/lttng.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 \
 		echo "lttng-context-perf-counters.o" ; fi;)
-endif
+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/
 
-endif
+endif # CONFIG_TRACEPOINTS
 
-else
+else # KERNELRELEASE
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
 	CFLAGS = $(EXTCFLAGS)
@@ -57,4 +63,4 @@ clean:
 
 %.i: %.c
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
-endif
+endif # KERNELRELEASE