projects / packages / lttng-modules.git / blame
| Commit | Line | Data |
|---|---|---|
| b5a5bc4f JB |
1 | --- lttng-modules-2.6.3/Makefile.orig 2015-09-14 20:30:29.749794009 +0200 |
| 2 | +++ lttng-modules-2.6.3/Makefile 2015-09-14 20:31:10.693125624 +0200 | |
| 11a6b978 | 3 | @@ -8,19 +8,19 @@ |
| 7528c1a9 | 4 | |
| 11a6b978 | 5 | TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST))) |
| b5a5bc4f | 6 | |
| 11a6b978 JR |
7 | - lttng_check_linux_version = $(shell pwd)/include/linux/version.h |
| 8 | - lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| 9 | +# lttng_check_linux_version = $(shell pwd)/include/linux/version.h | |
| 10 | +# lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| b5a5bc4f | 11 | |
| 11a6b978 JR |
12 | # |
| 13 | # Check for stale version.h, which can be a leftover from an old Linux | |
| 14 | # kernel tree moved to a newer kernel version, only pruned by make | |
| 15 | # distclean. | |
| 16 | # | |
| 17 | - ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 18 | - ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 19 | - $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) | |
| 20 | - endif | |
| 21 | - endif | |
| 22 | +# ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 23 | +# ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 24 | +# $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) | |
| 25 | +# endif | |
| 26 | +# endif | |
| 7528c1a9 | 27 | |
| 11a6b978 | 28 | include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds |
| b5a5bc4f | 29 |