X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile;h=9de6aed152cef0d6ad1012a08663f09bbb129544;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=ebd355c7f575e908fd51d4434f443f63bd1b5496;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index ebd355c7..9de6aed1 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),)
 
   include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
-  ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
+  ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
   obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o
   obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o
@@ -63,9 +63,8 @@ ifneq ($(KERNELRELEASE),)
                        lttng-context-interruptible.o \
                        lttng-context-need-reschedule.o \
                        lttng-context-callstack.o lttng-calibrate.o \
-                       lttng-context-hostname.o wrapper/random.o \
-                       probes/lttng.o wrapper/trace-clock.o \
-                       wrapper/page_alloc.o \
+                       lttng-context-hostname.o \
+                       probes/lttng.o trace-clock.o \
                        lttng-tracker-id.o \
                        lttng-filter.o lttng-filter-interpreter.o \
                        lttng-filter-specialize.o \
@@ -90,10 +89,7 @@ ifneq ($(KERNELRELEASE),)
     lttng-tracer-objs += lttng-context-preemptible.o
   endif
 
-  lttng-tracer-objs += $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 \) ] ; then \
-      echo "lttng-tracepoint.o" ; fi;)
+  lttng-tracer-objs += lttng-tracepoint.o
 
   lttng-tracer-objs += lttng-context-cgroup-ns.o
 
@@ -122,8 +118,7 @@ ifneq ($(KERNELRELEASE),)
   endif
 
   obj-$(CONFIG_LTTNG) += lttng-statedump.o
-  lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
-                          wrapper/fdtable.o
+  lttng-statedump-objs := lttng-statedump-impl.o
 
   obj-$(CONFIG_LTTNG) += probes/
   obj-$(CONFIG_LTTNG) += lib/