From 78f48448e50c8f98825675938bd48508db8407b8 Mon Sep 17 00:00:00 2001 From: Theodore Ateba Date: Wed, 14 Mar 2018 07:45:40 +0000 Subject: AVR: Resolve compilation problem, missing chlib.h and chlicense.h git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11735 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/AVR/NIL-ARDUINO-MEGA/Makefile | 19 +++++++++---------- demos/AVR/NIL-ARDUINO-MINI/Makefile | 19 +++++++++---------- demos/AVR/NIL-ARDUINO-NANO/Makefile | 19 +++++++++---------- demos/AVR/NIL-ARDUINO-UNO/Makefile | 19 +++++++++---------- demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile | 19 +++++++++---------- demos/AVR/NIL-MT-DB-X4/Makefile | 20 +++++++++----------- demos/AVR/RT-ARDUINO-LEONARDO/Makefile | 22 ++++++++++------------ demos/AVR/RT-ARDUINO-MEGA/Makefile | 18 +++++++----------- demos/AVR/RT-ARDUINO-MINI/Makefile | 20 +++++++++----------- demos/AVR/RT-ARDUINO-NANO/Makefile | 20 +++++++++----------- demos/AVR/RT-ARDUINO-UNO/Makefile | 20 +++++++++----------- demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile | 21 +++++++++------------ demos/AVR/RT-MT-DB-X4/Makefile | 20 +++++++++----------- demos/AVR/RT-PRO-MICRO/Makefile | 22 ++++++++++------------ demos/AVR/RT-TEENSY2-USB/Makefile | 25 +++++++++++-------------- demos/AVR/TEST-SUITE-NIL/Makefile | 21 ++++++++++----------- demos/AVR/TEST-SUITE-OSLIB/Makefile | 22 ++++++++++------------ demos/AVR/TEST-SUITE-RT/Makefile | 22 ++++++++++------------ 18 files changed, 167 insertions(+), 201 deletions(-) diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile index d0b7e6e43..d043c4921 100644 --- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile +++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile @@ -84,30 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/NIL-ARDUINO-MINI/Makefile b/demos/AVR/NIL-ARDUINO-MINI/Makefile index e9db784bd..510301b7c 100644 --- a/demos/AVR/NIL-ARDUINO-MINI/Makefile +++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile @@ -84,30 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MINI/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/NIL-ARDUINO-NANO/Makefile b/demos/AVR/NIL-ARDUINO-NANO/Makefile index 7f4ea1a58..dbd7457b1 100644 --- a/demos/AVR/NIL-ARDUINO-NANO/Makefile +++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile @@ -84,30 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_NANO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile index 159a6f752..062bfb55d 100644 --- a/demos/AVR/NIL-ARDUINO-UNO/Makefile +++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile @@ -84,30 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile index 832dc98e1..c6630601b 100644 --- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile +++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile @@ -84,30 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/DIGISPARK_ATTINY_167/board.mk include $(CHIBIOS)/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/NIL-MT-DB-X4/Makefile b/demos/AVR/NIL-MT-DB-X4/Makefile index 92177ac85..18ee8d7bd 100644 --- a/demos/AVR/NIL-MT-DB-X4/Makefile +++ b/demos/AVR/NIL-MT-DB-X4/Makefile @@ -84,31 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile index c943e74c8..5ab9e86cf 100644 --- a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile +++ b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile @@ -84,32 +84,30 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_LEONARDO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - usbcfg.c \ +CSRC = $(ALLCSRC) \ + usbcfg.c \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile index 10ec9f983..0447265c5 100644 --- a/demos/AVR/RT-ARDUINO-MEGA/Makefile +++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile @@ -84,31 +84,27 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-ARDUINO-MINI/Makefile b/demos/AVR/RT-ARDUINO-MINI/Makefile index 761fb52c3..f95a2b415 100644 --- a/demos/AVR/RT-ARDUINO-MINI/Makefile +++ b/demos/AVR/RT-ARDUINO-MINI/Makefile @@ -85,31 +85,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MINI/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-ARDUINO-NANO/Makefile b/demos/AVR/RT-ARDUINO-NANO/Makefile index e9ccd2db6..d4bf5f656 100644 --- a/demos/AVR/RT-ARDUINO-NANO/Makefile +++ b/demos/AVR/RT-ARDUINO-NANO/Makefile @@ -85,31 +85,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_NANO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-ARDUINO-UNO/Makefile b/demos/AVR/RT-ARDUINO-UNO/Makefile index 15a8c5dd0..c73e50f65 100644 --- a/demos/AVR/RT-ARDUINO-UNO/Makefile +++ b/demos/AVR/RT-ARDUINO-UNO/Makefile @@ -84,31 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile index 271353fca..622e0e25d 100644 --- a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile +++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile @@ -84,32 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/DIGISPARK_ATTINY_167/board.mk include $(CHIBIOS)/os/hal/ports/AVR/TINY/ATTinyxxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk - # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-MT-DB-X4/Makefile b/demos/AVR/RT-MT-DB-X4/Makefile index 3a36e5bf5..89b73c1c0 100644 --- a/demos/AVR/RT-MT-DB-X4/Makefile +++ b/demos/AVR/RT-MT-DB-X4/Makefile @@ -84,31 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-PRO-MICRO/Makefile b/demos/AVR/RT-PRO-MICRO/Makefile index fb06065a4..9d95f272b 100644 --- a/demos/AVR/RT-PRO-MICRO/Makefile +++ b/demos/AVR/RT-PRO-MICRO/Makefile @@ -84,32 +84,30 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/SPARKFUN_PRO_MICRO/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - usbcfg.c \ +CSRC = $(ALLCSRC) \ + usbcfg.c \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/RT-TEENSY2-USB/Makefile b/demos/AVR/RT-TEENSY2-USB/Makefile index 644547318..9b217e9bd 100644 --- a/demos/AVR/RT-TEENSY2-USB/Makefile +++ b/demos/AVR/RT-TEENSY2-USB/Makefile @@ -84,37 +84,34 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/PJRC_TEENSY_2PLUSPLUS/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk include $(CHIBIOS)/os/various/shell/shell.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - $(STREAMSSRC) \ - $(SHELLSRC) \ - usbcfg.c \ +CSRC = $(ALLCSRC) \ + usbcfg.c \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(STREAMSINC) \ - $(BOARDINC) $(CHIBIOS)/os/various $(CHIBIOS)/os/various/shell \ +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/demos/AVR/TEST-SUITE-NIL/Makefile b/demos/AVR/TEST-SUITE-NIL/Makefile index ce656164a..67f547eae 100644 --- a/demos/AVR/TEST-SUITE-NIL/Makefile +++ b/demos/AVR/TEST-SUITE-NIL/Makefile @@ -84,34 +84,33 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/nil/nil_test.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ + $(TESTSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) +INCDIR = $(ALLINC) $(TESTINC) # # Project, sources and paths. diff --git a/demos/AVR/TEST-SUITE-OSLIB/Makefile b/demos/AVR/TEST-SUITE-OSLIB/Makefile index a094aa706..ee1aec2df 100644 --- a/demos/AVR/TEST-SUITE-OSLIB/Makefile +++ b/demos/AVR/TEST-SUITE-OSLIB/Makefile @@ -84,35 +84,33 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ + $(TESTSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +INCDIR = $(ALLINC) $(TESTINC) # # Project, sources and paths. diff --git a/demos/AVR/TEST-SUITE-RT/Makefile b/demos/AVR/TEST-SUITE-RT/Makefile index f8345f798..2619048af 100644 --- a/demos/AVR/TEST-SUITE-RT/Makefile +++ b/demos/AVR/TEST-SUITE-RT/Makefile @@ -84,35 +84,33 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/rt/rt_test.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ + $(TESTSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +INCDIR = $(ALLINC) $(TESTINC) # # Project, sources and paths. -- cgit v1.2.3