Fix: build against out-of-tree kernel build

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d6be9425bf3faf230a1a4655a0bb8a65c5033d1..9324f329ef27cd23badb6ebc9e02e1c501b7a860 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ifneq ($(KERNELRELEASE),)
 
   ifneq ($(CONFIG_TRACEPOINTS),)
 
-    MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
+    TOP_LTTNG_MODULES_DIR := $(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
@@ -25,7 +25,9 @@ ifneq ($(KERNELRELEASE),)
       endif
     endif
 
-    include $(MAKEFILEDIR)/Makefile.ABI.workarounds
+    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
@@ -55,10 +57,6 @@ ifneq ($(KERNELRELEASE),)
                          lttng-filter-validator.o \
                          probes/lttng-probe-user.o
 
-    obj-$(CONFIG_LTTNG) += 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
@@ -84,6 +82,10 @@ ifneq ($(KERNELRELEASE),)
         -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/