projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: format address fields as hexadecimal
[lttng-modules.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index f233e660473b8b21167d8ecea5a4b3593fcdd692..6bf4d2879a8d46d5bed3067b8b3c47f2b629fb82 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,11
+5,13
@@
ifneq ($(KERNELRELEASE),)
ifneq ($(CONFIG_TRACEPOINTS),)
ifneq ($(KERNELRELEASE),)
ifneq ($(CONFIG_TRACEPOINTS),)
-KERNELDIR=${LTTNG_KERNELDIR}
+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
+23,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
@@
-48,10
+50,6
@@
lttng-tracer-objs := lttng-events.o lttng-abi.o \
lttng-filter-validator.o \
probes/lttng-probe-user.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
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
lttng-tracer-objs += lttng-syscalls.o
endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
@@
-68,6
+66,10
@@
lttng-tracer-objs += $(shell \
-o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
echo "lttng-tracepoint.o" ; fi;)
-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/
obj-m += probes/
obj-m += lib/
This page took
0.02514 seconds
and
4
git commands to generate.