X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=731a38671a1e050528443e6252e79d88b609cc78;hb=refs%2Fheads%2Fstable-2.7;hp=bdbd5b35b6cd6e2ad7c4042147cad002d5fa740a;hpb=389d70703bbd804c4f000d89ef2efbe169c6028f;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index bdbd5b35..731a3867 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,20 @@
 #
 
 ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_TRACEPOINTS),)
+
+ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
+ifeq ($(CONFIG_TRACEPOINTS),)
+$(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+endif # CONFIG_TRACEPOINTS
+endif # ifdef CONFIG_LOCALVERSION
+
+KERNELDIR = ${LTTNG_KERNELDIR}
+MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 lttng_check_linux_version = $(shell pwd)/include/linux/version.h
 lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
 
+
 #
 # 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
@@ -19,6 +28,15 @@ $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
 endif
 endif
 
+ifneq ($(shell \
+	if [ $(VERSION) -ge 5 \
+		-o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -ge 8 \) ] ; then \
+		echo "true" ; fi;),)
+$(warning You are entering uncharted territories adventurer! Proceed with utmost caution (also, lttng-modules 2.7 does not support Linux >= 4.8. You should upgrade to a newer lttng-modules version.))
+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
@@ -33,7 +51,8 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.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-vppid.o lttng-context-cpu-id.o \
+			lttng-calibrate.o \
 			lttng-context-hostname.o wrapper/random.o \
 			probes/lttng.o wrapper/trace-clock.o \
 			wrapper/page_alloc.o \
@@ -43,10 +62,6 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
 			lttng-filter-validator.o \
 			probes/lttng-probe-user.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
 endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
@@ -63,25 +78,29 @@ lttng-tracer-objs += $(shell \
 		-o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
 		echo "lttng-tracepoint.o" ; fi;)
 
+obj-m += lttng-statedump.o
+lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+			wrapper/fdtable.o
+
 obj-m += probes/
 obj-m += lib/
 
-endif # CONFIG_TRACEPOINTS
-
 else # KERNELRELEASE
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
 	CFLAGS = $(EXTCFLAGS)
 
-default:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+default: modules
+
+modules:
+	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
 
 modules_install:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
 
 clean:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
 endif # KERNELRELEASE