From d8333bc79881f47a9bbc9b77903038bbf3433e1b Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Fri, 9 Mar 2018 10:45:58 +0000 Subject: Updated all STM32's demo makefiles git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11661 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP') diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile index b8f7a59f1..4441d9cdd 100644 --- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile +++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile @@ -88,6 +88,9 @@ CONFDIR := ./cfg # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk # HAL-OSAL files (optional). @@ -109,18 +112,15 @@ LDSCRIPT= $(STARTUPLD)/STM32F107xC.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ $(TESTSRC) \ - $(LWSRC) \ $(CHIBIOS)/os/various/evtimer.c \ web/web.c main.c +# C++ sources that can be compiled in ARM or THUMB mode depending on the global +# setting. +CPPSRC = $(ALLCPPSRC) + # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. CPPSRC = @@ -146,14 +146,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) - -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(LWINC) \ - $(CHIBIOS)/os/various $(CONFDIR) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) + +INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) # # Project, sources and paths -- cgit v1.2.3