aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/ARMCM3-STM32F103-FATFS-GCC/Makefile46
-rw-r--r--demos/ARMCM3-STM32F103-GCC/Makefile42
2 files changed, 44 insertions, 44 deletions
diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
index 121d72b9f..a4822a4c7 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
@@ -57,25 +57,25 @@ LDSCRIPT= ch.ld
# Imported source files
CHIBIOS = ../..
-include ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.mk
-include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
-include ${CHIBIOS}/ext/fatfs/fatfs.mk
+include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
+include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCM3/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
+include $(CHIBIOS)/ext/fatfs/fatfs.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = ${PORTSRC} \
- ${KERNSRC} \
- ${TESTSRC} \
- ${HALSRC} \
- ${PLATFORMSRC} \
- ${BOARDSRC} \
- ${FATFSSRC} \
- ${CHIBIOS}/os/various/evtimer.c \
- ${CHIBIOS}/os/various/syscalls.c \
+CSRC = $(PORTSRC) \
+ $(KERNSRC) \
+ $(TESTSRC) \
+ $(HALSRC) \
+ $(PLATFORMSRC) \
+ $(BOARDSRC) \
+ $(FATFSSRC) \
+ $(CHIBIOS)/os/various/evtimer.c \
+ $(CHIBIOS)/os/various/syscalls.c \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -104,12 +104,12 @@ TCPPSRC =
# List ASM source files here
ASMSRC = $(PORTASM) \
- ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s
+ $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(PLATFORMINC) ${BOARDINC} \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
$(FATFSINC) \
- ${CHIBIOS}/os/various
+ $(CHIBIOS)/os/various
#
# Project, sources and paths
@@ -198,10 +198,10 @@ ULIBS =
##############################################################################
ifeq ($(USE_FWLIB),yes)
- include ${CHIBIOS}/ext/stm32lib/stm32lib.mk
- CSRC += ${STM32SRC}
- INCDIR += ${STM32INC}
+ include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
+ CSRC += $(STM32SRC)
+ INCDIR += $(STM32INC)
USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
-include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index afd458186..fd97754ff 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -57,23 +57,23 @@ LDSCRIPT= ch.ld
# Imported source files
CHIBIOS = ../..
-include ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.mk
-include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
+include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCM3/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = ${PORTSRC} \
- ${KERNSRC} \
- ${TESTSRC} \
- ${HALSRC} \
- ${PLATFORMSRC} \
- ${BOARDSRC} \
- ${CHIBIOS}/os/various/evtimer.c \
- ${CHIBIOS}/os/various/syscalls.c \
+CSRC = $(PORTSRC) \
+ $(KERNSRC) \
+ $(TESTSRC) \
+ $(HALSRC) \
+ $(PLATFORMSRC) \
+ $(BOARDSRC) \
+ $(CHIBIOS)/os/various/evtimer.c \
+ $(CHIBIOS)/os/various/syscalls.c \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -102,11 +102,11 @@ TCPPSRC =
# List ASM source files here
ASMSRC = $(PORTASM) \
- ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s
+ $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(PLATFORMINC) ${BOARDINC} \
- ${CHIBIOS}/os/various
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHIBIOS)/os/various
#
# Project, sources and paths
@@ -195,10 +195,10 @@ ULIBS =
##############################################################################
ifeq ($(USE_FWLIB),yes)
- include ${CHIBIOS}/ext/stm32lib/stm32lib.mk
- CSRC += ${STM32SRC}
- INCDIR += ${STM32INC}
+ include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
+ CSRC += $(STM32SRC)
+ INCDIR += $(STM32INC)
USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
-include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk