From 2883ca121e86d0f6ccb125e4ab5cf5075cfeda66 Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Tue, 19 Mar 2013 22:32:22 +0100
Subject: [PATCH] migrate to current Makefile structure

---
 Makefile.base    | 3 +++
 Makefile.include | 2 +-
 Makefile.modules | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile.base b/Makefile.base
index 9aefd1102c..a2274f864b 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -38,6 +38,9 @@ ifeq ($(BOARD),msb-430h)
  INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
  INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
 endif
+ifeq ($(BOARD),native)
+ INCLUDES += -I$(RIOTBOARD)/native/include/
+endif
 
 $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
 	$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
diff --git a/Makefile.include b/Makefile.include
index 6aa42d5b5e..b345a8b017 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -18,7 +18,7 @@ all: $(PROJBINDIR)/$(PROJECT).a
 	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
 	$(MAKE) -C $(RIOTBOARD)
 	$(MAKE) -C $(RIOTBASE)
-	$(LINK) $(LINKFLAGS) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group  -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map
+	$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group  -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map $(LINKFLAGS) 
 	$(SIZE) $(PROJBINDIR)/$(PROJECT).elf
 	$(OBJCOPY) -O ihex $(PROJBINDIR)/$(PROJECT).elf $(PROJBINDIR)/$(PROJECT).hex
 
diff --git a/Makefile.modules b/Makefile.modules
index 72cb737ff6..94f123c06a 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -13,6 +13,9 @@ ifeq ($(CPU),lpc214x)
   USEMODULE += arm_common
   UNDEF += $(BINDIR)syscalls.o
 endif
+ifeq ($(CPU),native)
+  export INCLUDES += -I$(RIOTBASE)/cpu/native/include
+endif
 ifeq ($(CPU),cc430)
 USEMODULE += cpu core lib sys
 else
-- 
GitLab