Merge pull request #804 from LudwigOrtmann/native_include_separation

native/make: Don't use INCLUDES for building any native at all.

boards/native/Makefile

@@ -7,5 +7,11 @@ all: $(BINDIR)$(MODULE).a
 
 include $(RIOTBASE)/Makefile.base
 
+$(BINDIR)%.o: %.c
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c > $(BINDIR)$*.d
+	@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
+
+
 clean::
 	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

boards/native/Makefile.include

@@ -1,4 +1,7 @@
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
+export NATIVEINCLUDES = -I$(RIOTBOARD)/$(BOARD)/include/
+export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
+export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
+
 export CPU = native
 export ELF = $(BINDIR)$(PROJECT).elf
 
@@ -23,7 +26,9 @@ export ASFLAGS =
 export DEBUGGER_FLAGS = $(ELF)
 export VALGRIND_FLAGS ?= --track-origins=yes
 all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g
-all-valgrind: export INCLUDES += $(shell pkg-config valgrind --cflags)
+all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags)
+
+export INCLUDES += $(NATIVEINCLUDES)
 
 # backward compatability with glibc <= 2.17 for native
 ifeq ($(CPU),native)

boards/native/drivers/Makefile

@@ -4,3 +4,8 @@ all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
+
+$(BINDIR)%.o: %.c
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c > $(BINDIR)$*.d
+	@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d

cpu/native/Makefile

@@ -1,7 +1,5 @@
 MODULE = cpu
 
-EXCLUDES := -I$(RIOTBASE)/sys/posix/%
-
 DIRS =
 ifneq (,$(filter rtc,$(USEMODULE)))
 	DIRS += rtc
@@ -16,8 +14,8 @@ all: $(BINDIR)$(MODULE).a
 include $(RIOTBASE)/Makefile.base
 
 $(BINDIR)%.o: %.c
-	$(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
-	@$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c > $(BINDIR)$*.d
 	@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
 
 

cpu/native/Makefile.include

@@ -1 +1 @@
-export INCLUDES += -I$(RIOTCPU)/native/include
+export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include

cpu/native/net/Makefile

@@ -1,10 +1,8 @@
-EXCLUDES := -I$(RIOTBASE)/sys/posix/%
-
 MODULE = nativenet
 
 include $(MAKEBASE)/Makefile.base
 
 $(BINDIR)%.o: %.c
-	$(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
-	@$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c > $(BINDIR)$*.d
 	@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d

cpu/native/rtc/Makefile

@@ -1,3 +1,8 @@
 MODULE =rtc
 
 include $(MAKEBASE)/Makefile.base
+
+$(BINDIR)%.o: %.c
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
+	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c > $(BINDIR)$*.d
+	@printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d