1 files changed, 9 insertions, 20 deletions
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex
index 112918a91..cbd3bc573 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex
@@ -90,6 +90,9 @@ DEPDIR   := ./.dep-stm32f407_olimex
 
 # 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_stm32f4xx.mk
 # HAL-OSAL files (optional).
@@ -114,25 +117,15 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.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) \
-       $(FATFSSRC) \
-       $(STREAMSSRC) \
-       $(SHELLSRC) \
        $(CHIBIOS)/os/various/evtimer.c \
        $(CONFDIR)/portab.c \
        src/usbcfg.c main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -155,14 +148,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) \
-         $(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
-         $(CHIBIOS)/os/various $(CONFDIR) ./cfg ./src
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
+
+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
 
 #
 # Project, sources and paths