Cleanup: Remove toplevel directory from include search path

Now that all include files are moved to include/ (except for those
meant to be included with "#include "...h"), we can remove the toplevel
directory from the include search path.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Makefile b/Makefile
index 07c21ea4f12603318c9886f220632fbd68d9cff3..7ee341e1c561a5940b60655ed3e635d1fc9c59a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),)
 
   include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
-  ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include
+  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

diff --git a/lib/Kbuild b/lib/Kbuild
index 6818cd950b2878badb1f8c245f61bbdbb59fdb02..a2837b4696fb055d56b1bed9f644d02ac53832d3 100644 (file)
--- a/lib/Kbuild
+++ b/lib/Kbuild
@@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
 include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
-ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include
+ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
 obj-$(CONFIG_LTTNG) += lttng-lib-ring-buffer.o
 

diff --git a/probes/Kbuild b/probes/Kbuild
index effd6f95ca0cbd96e1226c147682b6e9f601798f..9c53ca27a28b88c8e4f637221090297fd1e619e2 100644 (file)
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
 include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
-ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include
+ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
 obj-$(CONFIG_LTTNG) += lttng-probe-sched.o
 obj-$(CONFIG_LTTNG) += lttng-probe-irq.o

diff --git a/tests/Kbuild b/tests/Kbuild
index fa6740803a43905f0f5d3fa8c0c8a17f25b1f440..906cbac83329ba799112eabe9ba4865fec341eb6 100644 (file)
--- a/tests/Kbuild
+++ b/tests/Kbuild
@@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
 include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
-ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include
+ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
 obj-$(CONFIG_LTTNG) += lttng-test.o
 lttng-test-objs := probes/lttng-test.o