X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=66d94bcef2fc650147b4c18d7651ca270af81398;hb=refs%2Fheads%2Fstable-2.1;hp=b16c4c6fdb0b90ffea628d176623249693f0a19c;hpb=7514523fe6d6be9d94be2e577954cdd82296d20e;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index b16c4c6f..66d94bce 100644
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,42 @@
 #
 
 ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_MARKERS),)
-
-obj-m += ltt-core.o
-obj-m += ltt-tracer.o
-obj-m += ltt-marker-control.o
+ifneq ($(CONFIG_TRACEPOINTS),)
+
+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 \
+			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-calibrate.o \
+			lttng-context-hostname.o wrapper/random.o
+
+obj-m += lttng-statedump.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 probes/lttng-probe-user.o
+endif
 
-obj-m += ltt-relay.o
-ltt-relay-objs :=  ltt-event-header.o ltt-serialize.o ltt-type-serializer.o
-#ltt-ascii.o
+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
 
-obj-m += ltt-statedump.o
-obj-m += ltt-trace-control.o
-obj-m += ltt-userspace-event.o
-obj-m += ltt-filter.o
-obj-m += ltt-kprobes.o
 obj-m += probes/
+obj-m += lib/
 
 endif
 
@@ -32,9 +52,10 @@ default:
 
 modules_install:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-	/sbin/depmod -a
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
+%.i: %.c
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
 endif