From 54047c72d36686e0d5003b75157064ba9da9a9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Sun, 6 Jul 2014 05:02:45 +0200 Subject: [PATCH] native: override INCLUDES w/ NATIVEINCLUDES Currrently native overrides the object file targets, because it needs the different include paths to interact with libc and the OS. This PR simplifies their makefiles to only override the variable INCLUDES, instead of overriding the targets. --- boards/native/Makefile | 4 +--- boards/native/drivers/Makefile | 4 +--- cpu/native/Makefile | 4 +--- cpu/native/net/Makefile | 4 +--- cpu/native/rtc/Makefile | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/boards/native/Makefile b/boards/native/Makefile index 4f04983496..b70aa689d6 100644 --- a/boards/native/Makefile +++ b/boards/native/Makefile @@ -4,6 +4,4 @@ DIRS = drivers include $(RIOTBASE)/Makefile.base -$(BINDIR)$(MODULE)/%.o: %.c - @mkdir -p $(BINDIR)$(MODULE) - $(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c) +INCLUDES = $(NATIVEINCLUDES) diff --git a/boards/native/drivers/Makefile b/boards/native/drivers/Makefile index 7aae27e6e8..bbf86ee509 100644 --- a/boards/native/drivers/Makefile +++ b/boards/native/drivers/Makefile @@ -2,6 +2,4 @@ MODULE =$(BOARD)_base include $(RIOTBASE)/Makefile.base -$(BINDIR)$(MODULE)/%.o: %.c - @mkdir -p $(BINDIR)$(MODULE) - $(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c) +INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/Makefile b/cpu/native/Makefile index bdbaacf482..9a82a5150f 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -9,6 +9,4 @@ endif include $(RIOTBASE)/Makefile.base -$(BINDIR)$(MODULE)/%.o: %.c - @mkdir -p $(BINDIR)$(MODULE) - $(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c) +INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/net/Makefile b/cpu/native/net/Makefile index 4d84a17347..f4740d816d 100644 --- a/cpu/native/net/Makefile +++ b/cpu/native/net/Makefile @@ -2,6 +2,4 @@ MODULE = nativenet include $(RIOTBASE)/Makefile.base -$(BINDIR)$(MODULE)/%.o: %.c - @mkdir -p $(BINDIR)$(MODULE) - $(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c) +INCLUDES = $(NATIVEINCLUDES) diff --git a/cpu/native/rtc/Makefile b/cpu/native/rtc/Makefile index 2061205ea9..7d178b6174 100644 --- a/cpu/native/rtc/Makefile +++ b/cpu/native/rtc/Makefile @@ -1,5 +1,3 @@ include $(RIOTBASE)/Makefile.base -$(BINDIR)$(MODULE)/%.o: %.c - @mkdir -p $(BINDIR)$(MODULE) - $(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MD -MP -c -o $(BINDIR)$(MODULE)/$*.o $(abspath $*.c) +INCLUDES = $(NATIVEINCLUDES)