X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile;h=c2b12132dab6fa69ded50b4ae91be0d9252d2a7d;hb=1b7801d6f8db3901daa3c58149397c67ee341855;hp=588ca960bf00ce96c840c964a50b52a738b95bf4;hpb=7c1d1f3661023ebd19562a94d3c4c8107097917e;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 588ca960..c2b12132 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,11 @@ ifneq ($(KERNELRELEASE),)
   # This part of the Makefile is used when called by the kernel build system
   # and defines the modules to be built.
 
-  ifeq ($(CONFIG_TRACEPOINTS),)
-    $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
-  endif # CONFIG_TRACEPOINTS
+  ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
+    ifeq ($(CONFIG_TRACEPOINTS),)
+      $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+    endif # CONFIG_TRACEPOINTS
+  endif # ifdef CONFIG_LOCALVERSION
 
   TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
@@ -90,6 +92,7 @@ ifneq ($(KERNELRELEASE),)
 
   obj-$(CONFIG_LTTNG) += probes/
   obj-$(CONFIG_LTTNG) += lib/
+  obj-$(CONFIG_LTTNG) += tests/
 
 else # KERNELRELEASE
 
@@ -101,7 +104,9 @@ KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 PWD := $(shell pwd)
 CFLAGS = $(EXTCFLAGS)
 
-default:
+default: modules
+
+modules:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
 
 modules_install: