add AspectC++ to kconfig

9 files changed, 15 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index d4471fb..9ab2f86 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,10 @@ ifdef verbose
 	QUIET =
 endif
 
+ifeq (${aspectc}, 1)
+	CONFIG_aspectc = y
+endif
+
 ifneq (${app_dir}, )
 	include src/app/${app_dir}/Makefile.inc
 endif
diff --git a/script/mkconfig b/script/mkconfig
index 66da07c..c11a819 100755
--- a/script/mkconfig
+++ b/script/mkconfig
@@ -17,6 +17,10 @@ bool "C++ ostream support in stdout"
 default n
 depends on arch_esp8266 || arch_msp430fr5969lp || arch_msp430fr5994lp || arch_posix
 
+config aspectc
+bool "Build with AspectC++"
+default n
+
 config i2c_freq
 int "I2C Frequency [Hz]"
 range 1000 100000
diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index ea8c89b..acc8544 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -28,7 +28,7 @@ OBJDUMP = avr-objdump
 
 ARCH_SHORTNAME = avr
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
 endif
 
diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc
index 82f4ede..09736dd 100644
--- a/src/arch/blinkenrocket/Makefile.inc
+++ b/src/arch/blinkenrocket/Makefile.inc
@@ -15,7 +15,7 @@ OBJDUMP = avr-objdump
 
 ARCH_SHORTNAME = avr
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
 endif
 
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index 8d0a085..1b82d31 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -13,7 +13,7 @@ OBJCOPY = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-objcopy
 OBJDUMP = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-objdump
 SIZE = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-size
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++ -p . --Xcompiler
 endif
 
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 9e4c1bc..a422d05 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -28,7 +28,7 @@ CXX_TARGETS += src/arch/msp430fr5969lp/arch.cc
 CXX_TARGETS += src/arch/msp430fr5969lp/driver/gpio.cc
 CXX_TARGETS += src/arch/msp430fr5969lp/driver/stdout.cc
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler
 endif
 
diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc
index fe2d514..30e9146 100644
--- a/src/arch/msp430fr5994lp/Makefile.inc
+++ b/src/arch/msp430fr5994lp/Makefile.inc
@@ -35,7 +35,7 @@ CXX_TARGETS += src/arch/msp430fr5994lp/arch.cc
 CXX_TARGETS += src/arch/msp430fr5994lp/driver/gpio.cc
 CXX_TARGETS += src/arch/msp430fr5994lp/driver/stdout.cc
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	ifeq (${msp430_large}, )
 		CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler
 	else
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index ee7ae95..4ae0907 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -8,7 +8,7 @@ OBJDUMP = objdump
 
 ARCH_SHORTNAME = x64
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler
 endif
 
diff --git a/src/arch/stm32f446re-nucleo/Makefile.inc b/src/arch/stm32f446re-nucleo/Makefile.inc
index 7a11cf5..4df29e1 100644
--- a/src/arch/stm32f446re-nucleo/Makefile.inc
+++ b/src/arch/stm32f446re-nucleo/Makefile.inc
@@ -18,7 +18,7 @@ SIZE = arm-none-eabi-size
 
 CXX_TARGETS += src/arch/stm32f446re-nucleo/arch.cc
 
-ifeq (${aspectc}, 1)
+ifdef CONFIG_aspectc
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler arm-none-eabi-g++ -p . --Xcompiler
 endif