X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile;h=a9d1cb15911ba8d16c4d9e2af301246b8e492c3b;hb=refs%2Fheads%2Fstable-2.3;hp=01b0e7ee1b02d0f45e08b305cf45b77b98a9f7b5;hpb=becb1a77f72c28357fc6509c1ec25dc8d4804b2c;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 01b0e7ee..a9d1cb15 100644
--- a/Makefile
+++ b/Makefile
@@ -5,21 +5,44 @@
 ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
-obj-m += ltt-ring-buffer-client-discard.o
-obj-m += ltt-ring-buffer-client-overwrite.o
-obj-m += ltt-ring-buffer-metadata-client.o
-
-obj-m += ltt-relay.o
-ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
-			ltt-probes.o ltt-core.o ltt-context.o \
-			lttng-context-pid.o
+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 # 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 # 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)
@@ -29,9 +52,10 @@ default:
 
 modules_install:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-	/sbin/depmod -a
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
-endif
+%.i: %.c
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+endif # KERNELRELEASE