projects / packages / lttng-modules.git / blame
| Commit | Line | Data |
|---|---|---|
| 7528c1a9 JR |
1 | --- lttng-modules-2.5.1/Makefile~ 2014-10-20 22:48:47.000000000 +0200 |
| 2 | +++ lttng-modules-2.5.1/Makefile 2014-11-09 16:11:25.914717733 +0100 | |
| 3 | @@ -5,19 +5,19 @@ | |
| 4 | ifneq ($(KERNELRELEASE),) | |
| 5 | ifneq ($(CONFIG_TRACEPOINTS),) | |
| 6 | ||
| 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 | - | |
| 10 | +#lttng_check_linux_version = $(shell pwd)/include/linux/version.h | |
| 11 | +#lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| 12 | +# | |
| 13 | # | |
| 14 | # Check for stale version.h, which can be a leftover from an old Linux | |
| 15 | # kernel tree moved to a newer kernel version, only pruned by make | |
| 16 | # distclean. | |
| 17 | # | |
| 18 | -ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 19 | -ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 20 | -$(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) | |
| 21 | -endif | |
| 22 | -endif | |
| 23 | +#ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 24 | +#ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 25 | +#$(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) | |
| 26 | +#endif | |
| 27 | +#endif | |
| 28 | ||
| 29 | obj-m += lttng-ring-buffer-client-discard.o | |
| 30 | obj-m += lttng-ring-buffer-client-overwrite.o |