Update gitignore

[deliverable/lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 64d5885068d403a0dffa779d21e5e267a67d8f73..a2299771a103dedf5bff79e258aa12330e93c576 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ ifneq ($(KERNELRELEASE),)
 
   ifneq ($(CONFIG_TRACEPOINTS),)
 
-    KERNELDIR = ${LTTNG_KERNELDIR}
     MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
     lttng_check_linux_version = $(shell pwd)/include/linux/version.h
@@ -28,6 +27,8 @@ ifneq ($(KERNELRELEASE),)
 
     include $(MAKEFILEDIR)/Makefile.ABI.workarounds
 
+    ccflags-y += -I$(PWD)
+
     obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o
     obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o
     obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-client.o
@@ -56,10 +57,6 @@ ifneq ($(KERNELRELEASE),)
                          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
@@ -85,6 +82,10 @@ ifneq ($(KERNELRELEASE),)
         -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/
 
@@ -101,15 +102,15 @@ PWD := $(shell pwd)
 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:
-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
 
 clean:
-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
 
 endif # KERNELRELEASE