Fix: add modules target to base Makefile

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 871ff1a71e820533b31ad85b1de13591d1c98a1d..71cf3bf59c47c63441730a152d929d3c90bfc6da 100644 (file)
--- 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,8 @@ $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
 endif
 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
@@ -35,7 +46,8 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
                        lttng-context-vtid.o lttng-context-ppid.o \
                        lttng-context-vppid.o lttng-calibrate.o \
                        lttng-context-hostname.o wrapper/random.o \
-                       probes/lttng.o wrapper/trace-clock.o
+                       probes/lttng.o wrapper/trace-clock.o \
+                       wrapper/page_alloc.o
 
 obj-m += lttng-statedump.o
 lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
@@ -60,22 +72,22 @@ lttng-tracer-objs += $(shell \
 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