X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=Makefile;h=a9d1cb15911ba8d16c4d9e2af301246b8e492c3b;hp=6e4da6c94cfd8140bf31d0f23ba0929bb40503c8;hb=b3c40230ad700b12c39640d8593aece428a2702b;hpb=11b5a3c23711e1119185011f791f599713914d67

diff --git a/Makefile b/Makefile
index 6e4da6c9..a9d1cb15 100644
--- a/Makefile
+++ b/Makefile
@@ -5,28 +5,44 @@
 ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
-obj-m += ltt-core.o
-obj-m += ltt-debugfs-abi.o
-obj-m += ltt-events.o
-obj-m += ltt-ring-buffer-client-discard.o
-obj-m += ltt-ring-buffer-client-overwrite.o
-
-obj-m += ltt-relay.o
-ltt-relay-objs :=  ltt-event-header.o ltt-serialize.o ltt-type-serializer.o
-
-#obj-m += ltt-marker-control.o
-#obj-m += ltt-trace-control.o
-#ltt-ascii.o
-
-#obj-m += ltt-statedump.o
-#obj-m += ltt-userspace-event.o
-#obj-m += ltt-filter.o
-#obj-m += ltt-kprobes.o
-#obj-m += probes/
-
-endif
-
-else
+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 # CONFIG_TRACEPOINTS
+
+else # KERNELRELEASE
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
 	CFLAGS = $(EXTCFLAGS)
@@ -36,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