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 eeffdfe976b6e51296373c65e59703906341da20..462cf208778cb2df28e1c028e6cca16690e21b0b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,11
+3,18
@@
#
ifneq ($(KERNELRELEASE),)
#
ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_TRACEPOINTS),)
+
+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
@@
-19,6
+26,8
@@
$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
endif
endif
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
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
+44,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 \
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 \
obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
@@
-53,28
+63,27
@@
lttng-tracer-objs += $(shell \
endif # CONFIG_PERF_EVENTS
lttng-tracer-objs += $(shell \
endif # CONFIG_PERF_EVENTS
lttng-tracer-objs += $(shell \
- if [ $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 ] ; then \
+ if [ $(VERSION) -ge 4 \
+ -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
echo "lttng-tracepoint.o" ; fi;)
obj-m += probes/
obj-m += lib/
echo "lttng-tracepoint.o" ; fi;)
obj-m += probes/
obj-m += lib/
-endif # CONFIG_TRACEPOINTS
-
else # KERNELRELEASE
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
CFLAGS = $(EXTCFLAGS)
default:
else # KERNELRELEASE
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
CFLAGS = $(EXTCFLAGS)
default:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
modules_install:
modules_install:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
clean:
clean:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
%.i: %.c
%.i: %.c
- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
endif # KERNELRELEASE
endif # KERNELRELEASE
This page took
0.024226 seconds
and
4
git commands to generate.