From 3fddb519f01ca53f1fd6f5c24e154912b25d1138 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 17 Jul 2018 09:57:10 +0200
Subject: Move include/$arch to include/arch/$arch to be consistent with src/
 hierarchy

---
 src/arch/arduino-nano/Makefile.inc   | 1 -
 src/arch/esp8266/Makefile.inc        | 2 +-
 src/arch/msp430fr5969lp/Makefile.inc | 2 +-
 src/arch/posix/Makefile.inc          | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index bceecad..b97ae16 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -5,7 +5,6 @@ PROGRAMMER ?= usbasp
 PORT = /dev/ttyUSB0
 BAUD = 57600
 
-INCLUDES += -Iinclude/arduino-nano
 COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=16000000UL -DMULTIPASS_ARCH_arduino_nano
 COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C
 
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index 33df2b2..8deaa95 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -15,7 +15,7 @@ ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++ -p . --Xcompiler
 endif
 
-INCLUDES += -Iinclude/esp8266 -I${SDK_BASE}/include
+INCLUDES += -I${SDK_BASE}/include
 COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH -DMULTIPASS_ARCH_esp8266
 CXXFLAGS = -std=c++11
 LDFLAGS += -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 3b8fcd1..5512cb9 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -3,7 +3,7 @@
 CPU = 430x
 MCU = msp430fr5969
 
-INCLUDES += -Iinclude/msp430fr5969lp -I/opt/msp430/ti/gcc/include
+INCLUDES += -I/opt/msp430/ti/gcc/include
 COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5969lp
 COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C
 
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index a706314..03402bc 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -7,7 +7,6 @@ ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler
 endif
 
-INCLUDES += -Iinclude/posix
 TARGETS += src/arch/posix/arch.cc src/arch/posix/driver/gpio.cc
 TARGETS += src/arch/posix/driver/stdout.cc src/arch/posix/driver/uptime.cc
 
-- 
cgit v1.2.3