X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=236f3f052b256a43b207645f2b14b1034f4ec4af;hb=6ccec97391876d0d977a6add820aa0ca13c042d7;hp=7c878f0589209fa893b21a29709091e08e202380;hpb=b37d476e197064573206a68ed3bcc2e63257edd8;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 7c878f05..236f3f05 100644
--- a/Makefile
+++ b/Makefile
@@ -25,22 +25,24 @@ endif
 
 include $(MAKEFILEDIR)/Makefile.ABI.workarounds
 
-obj-m += lttng-ring-buffer-client-discard.o
-obj-m += lttng-ring-buffer-client-overwrite.o
-obj-m += lttng-ring-buffer-metadata-client.o
-obj-m += lttng-ring-buffer-client-mmap-discard.o
-obj-m += lttng-ring-buffer-client-mmap-overwrite.o
-obj-m += lttng-ring-buffer-metadata-mmap-client.o
-
-obj-m += lttng-tracer.o
-lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-client.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o
+obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o
+obj-$(CONFIG_LTTNG) += lttng-clock.o
+
+obj-$(CONFIG_LTTNG) += lttng-tracer.o
+lttng-tracer-objs := lttng-events.o lttng-abi.o \
 			lttng-probes.o lttng-context.o \
 			lttng-context-pid.o lttng-context-procname.o \
 			lttng-context-prio.o lttng-context-nice.o \
 			lttng-context-vpid.o lttng-context-tid.o \
 			lttng-context-vtid.o lttng-context-ppid.o \
 			lttng-context-vppid.o lttng-context-cpu-id.o \
-			lttng-calibrate.o \
+			lttng-context-interruptible.o \
+			lttng-context-need-reschedule.o lttng-calibrate.o \
 			lttng-context-hostname.o wrapper/random.o \
 			probes/lttng.o wrapper/trace-clock.o \
 			wrapper/page_alloc.o \
@@ -50,7 +52,7 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
 			lttng-filter-validator.o \
 			probes/lttng-probe-user.o
 
-obj-m += lttng-statedump.o
+obj-$(CONFIG_LTTNG) += lttng-statedump.o
 lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
 			wrapper/fdtable.o
 
@@ -65,13 +67,22 @@ lttng-tracer-objs += $(shell \
 		echo "lttng-context-perf-counters.o" ; fi;)
 endif # CONFIG_PERF_EVENTS
 
+ifneq ($(CONFIG_PREEMPT_RT_FULL),)
+lttng-tracer-objs += lttng-context-migratable.o
+lttng-tracer-objs += lttng-context-preemptible.o
+endif # CONFIG_PREEMPT_RT_FULL
+
+ifneq ($(CONFIG_PREEMPT),)
+lttng-tracer-objs += lttng-context-preemptible.o
+endif
+
 lttng-tracer-objs += $(shell \
 	if [ $(VERSION) -ge 4 \
 		-o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
 		echo "lttng-tracepoint.o" ; fi;)
 
-obj-m += probes/
-obj-m += lib/
+obj-$(CONFIG_LTTNG) += probes/
+obj-$(CONFIG_LTTNG) += lib/
 
 endif # CONFIG_TRACEPOINTS
 
@@ -81,7 +92,7 @@ else # KERNELRELEASE
 	CFLAGS = $(EXTCFLAGS)
 
 default:
-	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
 
 modules_install:
 	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install