aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile51
1 files changed, 22 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 2d17532..94cbbc7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,6 @@
# Project name
PROJECT=maple
-# STM Library prefix
-STM_SRC = stm32lib/src
STM_CONF = stm32conf/flash.conf
# ARM/GNU toolchain parameters
@@ -28,14 +26,13 @@ endif
BUILD_PATH = build
LIB_PATH = libmaple
-OUTDIRS = $(BUILD_PATH)/$(STM_SRC) \
+OUTDIRS = $(BUILD_PATH)/$(LIB_PATH)\
$(BUILD_PATH)/$(LIB_PATH)\
$(BUILD_PATH)/core \
$(BUILD_PATH)/core/comm
-INCLUDES = -Istm32lib/inc \
- -I$(LIB_PATH) \
+INCLUDES = -I$(LIB_PATH) \
-I./ \
-Icore \
-Icore/comm
@@ -61,30 +58,26 @@ ODFLAGS = -S
# main source file
MAIN=main.c
-STM32SRCS = $(STM_SRC)/stm32f10x_flash.c \
- $(STM_SRC)/stm32f10x_nvic.c \
- $(STM_SRC)/stm32f10x_rcc.c
-
-CSRC = libmaple/systick.c \
- libmaple/timers.c \
- libmaple/adc.c \
- libmaple/syscalls.c \
- libmaple/stm32f10x_it.c \
- libmaple/exti.c \
- libmaple/gpio.c \
- libmaple/nvic.c \
- libmaple/usart.c \
- libmaple/util.c \
- libmaple/usb.c \
- core/wiring.c \
- core/wiring_shift.c \
- core/wiring_analog.c \
- core/time.c \
- core/pwm.c \
- core/ext_interrupts.c \
- core/wiring_digital.c
-
-CSRC += $(STM32SRCS)
+CSRC = libmaple/systick.c \
+ libmaple/timers.c \
+ libmaple/adc.c \
+ libmaple/syscalls.c \
+ libmaple/stm32f10x_it.c \
+ libmaple/exti.c \
+ libmaple/gpio.c \
+ libmaple/nvic.c \
+ libmaple/usart.c \
+ libmaple/util.c \
+ libmaple/usb.c \
+ libmaple/rcc.c \
+ libmaple/flash.c \
+ core/wiring.c \
+ core/wiring_shift.c \
+ core/wiring_analog.c \
+ core/time.c \
+ core/pwm.c \
+ core/ext_interrupts.c \
+ core/wiring_digital.c
CPPSRC = core/wiring_math.cpp \
core/Print.cpp \