projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build against out-of-tree kernel build
[lttng-modules.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 64d5885068d403a0dffa779d21e5e267a67d8f73..9324f329ef27cd23badb6ebc9e02e1c501b7a860 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-9,8
+9,7
@@
ifneq ($(KERNELRELEASE),)
ifneq ($(CONFIG_TRACEPOINTS),)
ifneq ($(CONFIG_TRACEPOINTS),)
- KERNELDIR = ${LTTNG_KERNELDIR}
- 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
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
@@
-26,7
+25,9
@@
ifneq ($(KERNELRELEASE),)
endif
endif
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
obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o
obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o
@@
-56,10
+57,6
@@
ifneq ($(KERNELRELEASE),)
lttng-filter-validator.o \
probes/lttng-probe-user.o
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
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
lttng-tracer-objs += lttng-syscalls.o
endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
@@
-85,6
+82,10
@@
ifneq ($(KERNELRELEASE),)
-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-$(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/
obj-$(CONFIG_LTTNG) += probes/
obj-$(CONFIG_LTTNG) += lib/
@@
-101,15
+102,15
@@
PWD := $(shell pwd)
CFLAGS = $(EXTCFLAGS)
default:
CFLAGS = $(EXTCFLAGS)
default:
-
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
+ $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
modules_install:
modules_install:
-
LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD)
modules_install
+
$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m
modules_install
clean:
clean:
-
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+ $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
%.i: %.c
%.i: %.c
-
LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD)
$@
+
$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m
$@
endif # KERNELRELEASE
endif # KERNELRELEASE
This page took
0.023699 seconds
and
4
git commands to generate.