We currently use the custom variables KERNELDIR and LTTNG_KERNELDIR
to pass the kernel source tree directory to helper scripts. We should
instead use the built-in Kbuild variable CURDIR which is available in
all sub makefiles and always points to the kernel sources.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
ifneq ($(CONFIG_TRACEPOINTS),)
ifneq ($(CONFIG_TRACEPOINTS),)
- KERNELDIR = ${LTTNG_KERNELDIR}
MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
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
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+ $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+ $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+ $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
# the kernel EXTRAVERSION to figure it out. Translate this information
# into a define visible from the C preprocessor.
# the kernel EXTRAVERSION to figure it out. Translate this information
# into a define visible from the C preprocessor.
-DEB_API_VERSION:=$(shell $(MAKEFILEDIR)/abi-debian-version.sh $(KERNELDIR))
+DEB_API_VERSION:=$(shell $(MAKEFILEDIR)/abi-debian-version.sh $(CURDIR))
ifneq ($(DEB_API_VERSION), 0)
ccflags-y += -DDEBIAN_API_VERSION=$(DEB_API_VERSION)
endif
ifneq ($(DEB_API_VERSION), 0)
ccflags-y += -DDEBIAN_API_VERSION=$(DEB_API_VERSION)
endif
-RT_PATCH_VERSION:=$(shell $(MAKEFILEDIR)/rt-patch-version.sh $(KERNELDIR))
+RT_PATCH_VERSION:=$(shell $(MAKEFILEDIR)/rt-patch-version.sh $(CURDIR))
ifneq ($(RT_PATCH_VERSION), 0)
ccflags-y += -DRT_PATCH_VERSION=$(RT_PATCH_VERSION)
ifneq ($(RT_PATCH_VERSION), 0)
ccflags-y += -DRT_PATCH_VERSION=$(RT_PATCH_VERSION)