X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile;h=709b5dc022cc5e4876d10c6e722b7d19a6d47074;hb=refs%2Fheads%2Fns-phase-1;hp=64d5885068d403a0dffa779d21e5e267a67d8f73;hpb=a8907e9aed0aceb0a5e69709d0d57c0775bae3e0;p=deliverable%2Flttng-modules.git

diff --git a/Makefile b/Makefile
index 64d58850..709b5dc0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,94 +1,133 @@
-#
-# Makefile for the LTT objects.
-#
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
 
 ifneq ($(KERNELRELEASE),)
 
   # This part of the Makefile is used when called by the kernel build system
   # and defines the modules to be built.
 
-  ifneq ($(CONFIG_TRACEPOINTS),)
-
-    KERNELDIR = ${LTTNG_KERNELDIR}
-    MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
-
-    lttng_check_linux_version = $(shell pwd)/include/linux/version.h
-    lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
-
-    #
-    # Check for stale version.h, which can be a leftover from an old Linux
-    # kernel tree moved to a newer kernel version, only pruned by make
-    # distclean.
-    #
-    ifneq ($(wildcard $(lttng_check_linux_version)),)
-      ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
-        $(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)
-      endif
-    endif
-
-    include $(MAKEFILEDIR)/Makefile.ABI.workarounds
-
-    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
-    obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o
-    obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o
-    obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o
-    obj-$(CONFIG_LTTNG) += lttng-clock.o
-
-    obj-$(CONFIG_LTTNG) += lttng-tracer.o
-
-    lttng-tracer-objs := lttng-events.o lttng-abi.o \
-                         lttng-probes.o lttng-context.o \
-                         lttng-context-pid.o lttng-context-procname.o \
-                         lttng-context-prio.o lttng-context-nice.o \
-                         lttng-context-vpid.o lttng-context-tid.o \
-                         lttng-context-vtid.o lttng-context-ppid.o \
-                         lttng-context-vppid.o lttng-context-cpu-id.o \
-                         lttng-context-interruptible.o \
-                         lttng-context-need-reschedule.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-filter.o lttng-filter-interpreter.o \
-                         lttng-filter-specialize.o \
-                         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
-
-    ifneq ($(CONFIG_PERF_EVENTS),)
-      lttng-tracer-objs += $(shell \
-        if [ $(VERSION) -ge 3 \
-          -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
-          echo "lttng-context-perf-counters.o" ; fi;)
-    endif # CONFIG_PERF_EVENTS
-
-    ifneq ($(CONFIG_PREEMPT_RT_FULL),)
-      lttng-tracer-objs += lttng-context-migratable.o
-      lttng-tracer-objs += lttng-context-preemptible.o
-    endif # CONFIG_PREEMPT_RT_FULL
-
-    ifneq ($(CONFIG_PREEMPT),)
-      lttng-tracer-objs += lttng-context-preemptible.o
+  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)))
+
+  lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+  lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
+
+  #
+  # Check for stale version.h, which can be a leftover from an old Linux
+  # kernel tree moved to a newer kernel version, only pruned by make
+  # distclean.
+  #
+  ifneq ($(wildcard $(lttng_check_linux_version)),)
+    ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
+      $(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)
     endif
-
-    lttng-tracer-objs += $(shell \
-      if [ $(VERSION) -ge 4 \
-        -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
-        echo "lttng-tracepoint.o" ; fi;)
-
-    obj-$(CONFIG_LTTNG) += probes/
-    obj-$(CONFIG_LTTNG) += lib/
-
-  endif # CONFIG_TRACEPOINTS
+  endif
+
+  include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
+
+  ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
+
+  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
+  obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-discard.o
+  obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-mmap-overwrite.o
+  obj-$(CONFIG_LTTNG) += lttng-ring-buffer-metadata-mmap-client.o
+  obj-$(CONFIG_LTTNG) += lttng-clock.o
+
+  obj-$(CONFIG_LTTNG) += lttng-tracer.o
+
+  lttng-tracer-objs := lttng-events.o lttng-abi.o lttng-string-utils.o \
+                       lttng-probes.o lttng-context.o \
+                       lttng-context-pid.o lttng-context-procname.o \
+                       lttng-context-prio.o lttng-context-nice.o \
+                       lttng-context-vpid.o lttng-context-tid.o \
+                       lttng-context-vtid.o lttng-context-ppid.o \
+                       lttng-context-vppid.o lttng-context-cpu-id.o \
+                       lttng-context-uid.o \
+                       lttng-context-euid.o \
+                       lttng-context-suid.o \
+                       lttng-context-gid.o \
+                       lttng-context-egid.o \
+                       lttng-context-sgid.o \
+                       lttng-context-vuid.o \
+                       lttng-context-veuid.o \
+                       lttng-context-vsuid.o \
+                       lttng-context-vgid.o \
+                       lttng-context-vegid.o \
+                       lttng-context-vsgid.o \
+                       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-filter.o lttng-filter-interpreter.o \
+                       lttng-filter-specialize.o \
+                       lttng-filter-validator.o \
+                       probes/lttng-probe-user.o \
+                       lttng-tp-mempool.o
+
+  ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
+    lttng-tracer-objs += lttng-syscalls.o
+  endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
+
+  ifneq ($(CONFIG_PERF_EVENTS),)
+    lttng-tracer-objs += lttng-context-perf-counters.o
+  endif # CONFIG_PERF_EVENTS
+
+  ifneq ($(CONFIG_PREEMPT_RT_FULL),)
+    lttng-tracer-objs += lttng-context-migratable.o
+    lttng-tracer-objs += lttng-context-preemptible.o
+  endif # CONFIG_PREEMPT_RT_FULL
+
+  ifneq ($(CONFIG_PREEMPT),)
+    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-context-cgroup-ns.o
+
+  ifneq ($(CONFIG_IPC_NS),)
+    lttng-tracer-objs += lttng-context-ipc-ns.o
+  endif
+
+  ifneq ($(wildcard $(mnt_ns_dep)),)
+     lttng-tracer-objs += lttng-context-mnt-ns.o
+  endif
+
+  ifneq ($(CONFIG_NET_NS),)
+    lttng-tracer-objs += lttng-context-net-ns.o
+  endif
+
+  ifneq ($(CONFIG_PID_NS),)
+    lttng-tracer-objs += lttng-context-pid-ns.o
+  endif
+
+  ifneq ($(CONFIG_USER_NS),)
+    lttng-tracer-objs += lttng-context-user-ns.o
+  endif
+
+  ifneq ($(CONFIG_UTS_NS),)
+    lttng-tracer-objs += lttng-context-uts-ns.o
+  endif
+
+  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/
+  obj-$(CONFIG_LTTNG) += tests/
 
 else # KERNELRELEASE
 
@@ -100,16 +139,18 @@ KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 PWD := $(shell pwd)
 CFLAGS = $(EXTCFLAGS)
 
-default:
-	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
+default: modules
+
+modules:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
 
 modules_install:
-	LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=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 CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
 
 endif # KERNELRELEASE