Move headers under include/

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 709b5dc022cc5e4876d10c6e722b7d19a6d47074..9de6aed152cef0d6ad1012a08663f09bbb129544 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+# SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
 
 ifneq ($(KERNELRELEASE),)
 
@@ -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,10 +63,9 @@ 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-tracker-pid.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 \
                        lttng-filter-validator.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/