X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=9324f329ef27cd23badb6ebc9e02e1c501b7a860;hb=b933d85e8282a17474d166fc055c4a215a1e4bf9;hp=fa337a0fd97332dd2586a763f7895ada610f21f6;hpb=53f1f0ca4eb1890673992697c19e4e1507ec4ac5;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index fa337a0f..9324f329 100644
--- a/Makefile
+++ b/Makefile
@@ -3,36 +3,114 @@
 #
 
 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
+  # This part of the Makefile is used when called by the kernel build system
+  # and defines the modules to be built.
 
-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 lttng-context-comm.o \
-			lttng-context-prio.o lttng-context-nice.o
+  ifneq ($(CONFIG_TRACEPOINTS),)
 
-obj-m += probes/
-obj-m += lib/
+    TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
-endif
+    lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+    lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
 
-else
-	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-	PWD := $(shell pwd)
-	CFLAGS = $(EXTCFLAGS)
+    #
+    # Check for stale version.h, which can be a leftover from an old Linux
+    # kernel tree moved to a newer kernel version, only pruned by make
+    # distclean.
+    #
+    ifneq ($(wildcard $(lttng_check_linux_version)),)
+      ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
+        $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
+      endif
+    endif
+
+    include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds
+
+    ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
+
+    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-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 \
+                         lttng-tracker-pid.o \
+                         lttng-filter.o lttng-filter-interpreter.o \
+                         lttng-filter-specialize.o \
+                         lttng-filter-validator.o \
+                         probes/lttng-probe-user.o
+
+    ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
+      lttng-tracer-objs += lttng-syscalls.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
+
+    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-$(CONFIG_LTTNG) += lttng-statedump.o
+    lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+                            wrapper/fdtable.o
+
+    obj-$(CONFIG_LTTNG) += probes/
+    obj-$(CONFIG_LTTNG) += lib/
+
+  endif # CONFIG_TRACEPOINTS
+
+else # KERNELRELEASE
+
+# This part of the Makefile is used when the 'make' command is runned in the
+# base directory of the lttng-modules sources. It sets some environment and
+# calls the kernel build system to build the actual modules.
+
+KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+PWD := $(shell pwd)
+CFLAGS = $(EXTCFLAGS)
 
 default:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
 
 modules_install:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
-	/sbin/depmod -a
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
-endif
+%.i: %.c
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
+
+endif # KERNELRELEASE