projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: trigger build error if CONFIG_TRACEPOINTS is not set
[lttng-modules.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 5277386915d87ce6bf7afefdb164e274b0879212..462cf208778cb2df28e1c028e6cca16690e21b0b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,13
+3,18
@@
#
ifneq ($(KERNELRELEASE),)
#
ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_TRACEPOINTS),)
-KERNELDIR=${LTTNG_KERNELDIR}
+ifeq ($(CONFIG_TRACEPOINTS),)
+$(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+endif # CONFIG_TRACEPOINTS
+
+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
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
#
# 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
@@
-21,7
+26,7
@@
$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
endif
endif
endif
endif
-include $(
KBUILD_EXTMOD
)/Makefile.ABI.workarounds
+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-client-discard.o
obj-m += lttng-ring-buffer-client-overwrite.o
@@
-65,8
+70,6
@@
lttng-tracer-objs += $(shell \
obj-m += probes/
obj-m += lib/
obj-m += probes/
obj-m += lib/
-endif # CONFIG_TRACEPOINTS
-
else # KERNELRELEASE
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
else # KERNELRELEASE
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
This page took
0.024839 seconds
and
4
git commands to generate.