From 93a521c50132e24558e42bc57dcf9c94051f07e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 27 Feb 2018 18:36:53 +0100 Subject: [PATCH] native: remove non required NATIVEINCLUDES Some modules used a 'NATIVEINCLUDES' with different include path and no other included directories. It was defining basic 'include' in a different order and not using other things defined in INCLUDES. After doing some checks with the given include path and possible conflicting files, there should be no conflict when using the default one. * No common headers between all the NATIVEINCLUDES directories * No common headers files between board/native/include, cpu/native/include and other files in the repository (except other boards/cpus of course). --- boards/native/Makefile | 2 -- boards/native/Makefile.include | 12 ++++-------- boards/native/drivers/Makefile | 2 -- cpu/native/Makefile | 2 -- cpu/native/Makefile.include | 4 +--- cpu/native/mtd/Makefile | 2 -- cpu/native/netdev_tap/Makefile | 2 -- cpu/native/socket_zep/Makefile | 2 -- 8 files changed, 5 insertions(+), 23 deletions(-) diff --git a/boards/native/Makefile b/boards/native/Makefile index 4bd9762991..1f64a6ab76 100644 --- a/boards/native/Makefile +++ b/boards/native/Makefile @@ -3,5 +3,3 @@ MODULE = board DIRS = drivers include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES) diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 92151fd84f..811b2ac5a1 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -1,10 +1,8 @@ -export NATIVEINCLUDES += -DNATIVE_INCLUDES -export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ -export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ -export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ - export CPU = native +# Configuration for core/include/kernel_types.h +CFLAGS += -DNATIVE_INCLUDES + USEMODULE += native-drivers # toolchain: @@ -117,7 +115,7 @@ debug-valgrind-server: export VALGRIND_FLAGS ?= --vgdb=yes --vgdb-error=0 -v \ term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind term-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE) all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g -all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags) +all-valgrind: export CFLAGS += $(shell pkg-config valgrind --cflags) all-debug: export CFLAGS += -g all-cachegrind: export CFLAGS += -g all-gprof: export CFLAGS += -pg @@ -126,8 +124,6 @@ all-asan: export CFLAGS += -fsanitize=address -fno-omit-frame-pointer -g all-asan: export CFLAGS += -DNATIVE_IN_CALLOC all-asan: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g -export INCLUDES += $(NATIVEINCLUDES) - export CFLAGS += -DDEBUG_ASSERT_VERBOSE # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 diff --git a/boards/native/drivers/Makefile b/boards/native/drivers/Makefile index 3aae3fd580..e717c6fd8e 100644 --- a/boards/native/drivers/Makefile +++ b/boards/native/drivers/Makefile @@ -1,5 +1,3 @@ MODULE = native-drivers include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/Makefile b/cpu/native/Makefile index 1891eebc41..b98a87cf52 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -24,5 +24,3 @@ ifneq (,$(filter can_linux,$(USEMODULE))) endif include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include index b02f64a1da..07013f62cd 100644 --- a/cpu/native/Makefile.include +++ b/cpu/native/Makefile.include @@ -1,8 +1,6 @@ -export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include - # Local include for OSX ifeq ($(BUILDOSXNATIVE),1) - export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra + INCLUDES += -I$(RIOTCPU)/native/osx-libc-extra endif USEMODULE += periph diff --git a/cpu/native/mtd/Makefile b/cpu/native/mtd/Makefile index f0006b95d8..b7dc90ebfc 100644 --- a/cpu/native/mtd/Makefile +++ b/cpu/native/mtd/Makefile @@ -1,5 +1,3 @@ MODULE := mtd_native include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/netdev_tap/Makefile b/cpu/native/netdev_tap/Makefile index 7d178b6174..48422e909a 100644 --- a/cpu/native/netdev_tap/Makefile +++ b/cpu/native/netdev_tap/Makefile @@ -1,3 +1 @@ include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/socket_zep/Makefile b/cpu/native/socket_zep/Makefile index 7d178b6174..48422e909a 100644 --- a/cpu/native/socket_zep/Makefile +++ b/cpu/native/socket_zep/Makefile @@ -1,3 +1 @@ include $(RIOTBASE)/Makefile.base - -INCLUDES = $(NATIVEINCLUDES)